diff options
author | michelou <michelou@epfl.ch> | 2008-01-22 17:51:40 +0000 |
---|---|---|
committer | michelou <michelou@epfl.ch> | 2008-01-22 17:51:40 +0000 |
commit | 2bb757ae597d57643e723a7c3279650cdd173b3d (patch) | |
tree | 8c0ec6ba9e93e4c910d12dc822b857a08463f4ea /src/manual | |
parent | cb1daed658c64908503aa7b4c082a76ddd50c239 (diff) | |
download | scala-2bb757ae597d57643e723a7c3279650cdd173b3d.tar.gz scala-2bb757ae597d57643e723a7c3279650cdd173b3d.tar.bz2 scala-2bb757ae597d57643e723a7c3279650cdd173b3d.zip |
applied path for #325, update scalac man pages
Diffstat (limited to 'src/manual')
-rw-r--r-- | src/manual/scala/man1/scalac.scala | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/src/manual/scala/man1/scalac.scala b/src/manual/scala/man1/scalac.scala index eefbc9d3f2..34d69d2ef4 100644 --- a/src/manual/scala/man1/scalac.scala +++ b/src/manual/scala/man1/scalac.scala @@ -1,11 +1,14 @@ /* NSC -- new Scala compiler - * Copyright 2005-2007 LAMP/EPFL + * Copyright 2005-2008 LAMP/EPFL * @author Stephane Micheloud */ //$Id$ package scala.man1 +/** + * @author Stephane Micheloud + */ object scalac extends Command { import _root_.scala.tools.docutil.ManPage._ @@ -124,7 +127,8 @@ object scalac extends Command { SeqPara( "Specify which backend to use (" & Mono("jvm-1.5,jvm-1.4," & "msil,cldc") & ").", - "The default value is " & Mono("\"jvm-1.4\"") & ".")), + "The default value is " & Mono("\"jvm-1.5\"") & " (was " & + Mono("\"jvm-1.4\"") & " up to Scala version 2.6.1).")), Definition( CmdOption("print"), "Print program with all Scala-specific features removed" @@ -158,9 +162,6 @@ object scalac extends Command { CmdOption("Xcheck-null"), "Emit warning on selection of nullable reference"), Definition( - CmdOption("Xdebug"), - "Output debugging messages."), - Definition( CmdOption("Xdisable-assertions"), "Generate no assertions and assumptions"), Definition( @@ -197,6 +198,9 @@ object scalac extends Command { CmdOption("Xprint-types"), "Print tree types (debugging option)."), Definition( + CmdOption("Xprompt"), + "Display a prompt after each error (debugging option)."), + Definition( CmdOption("Xresident"), "Compiler stays resident, files to compile are read from standard " & "input."), @@ -211,7 +215,10 @@ object scalac extends Command { "Print a synopsis of compiler phases."), Definition( CmdOption("Xsource-reader", Argument("classname")), - "Specify a custom method for reading source files.") + "Specify a custom method for reading source files."), + Definition( + CmdOption("Xscript", Argument("object")), + "Compile as a script, wrapping the code into object.main().") ) ), |