diff options
author | michelou <michelou@epfl.ch> | 2007-02-26 13:47:22 +0000 |
---|---|---|
committer | michelou <michelou@epfl.ch> | 2007-02-26 13:47:22 +0000 |
commit | b94b6f9af69aa73f1b2917414fdcdc2d007f2976 (patch) | |
tree | 0696558a57c3032e338103a985dab99cd8138e78 | |
parent | f55b965036e18fd833deecca0367cc192cf9818e (diff) | |
download | scala-b94b6f9af69aa73f1b2917414fdcdc2d007f2976.tar.gz scala-b94b6f9af69aa73f1b2917414fdcdc2d007f2976.tar.bz2 scala-b94b6f9af69aa73f1b2917414fdcdc2d007f2976.zip |
updated tool options in man pages
-rw-r--r-- | src/library/scala/concurrent/pilib.scala | 42 | ||||
-rw-r--r-- | src/manual/scala/man1/scalac.scala | 43 | ||||
-rw-r--r-- | src/manual/scala/man1/scaladoc.scala | 8 |
3 files changed, 69 insertions, 24 deletions
diff --git a/src/library/scala/concurrent/pilib.scala b/src/library/scala/concurrent/pilib.scala index 5d747f5188..33a79b85b0 100644 --- a/src/library/scala/concurrent/pilib.scala +++ b/src/library/scala/concurrent/pilib.scala @@ -1,7 +1,7 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** ** / __/ __// _ | / / / _ | (c) 2003-2007, LAMP/EPFL ** -** __\ \/ /__/ __ |/ /__/ __ | ** +** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** \* */ @@ -13,29 +13,31 @@ package scala.concurrent /** <p> - * Library for using Pi-calculus concurrent primitives in Scala. As an + * Library for using Pi-calculus concurrent primitives in + * <a href="http://scala-lang.org/" target="_top">Scala</a>. As an * example, the definition of a two-place buffer using the <code>pilib</code> - * library looks like: - * </p><pre> - * <b>def</b> Buffer[a](put: Chan[a], get: Chan[a]): unit = { - * <b>def</b> B0: unit = choice ( put * { x => B1(x) } ); - * <b>def</b> B1(x: a): unit = choice ( get(x) * B0, put * { y => B2(x, y) } ) - * <b>def</b> B2(x: a, y: a): unit = choice ( get(x) * B1(y) ) - * B0 - * } - * </pre> + * library looks like: + * </p><pre> + * <b>def</b> Buffer[a](put: Chan[a], get: Chan[a]): unit = { + * <b>def</b> B0: unit = choice ( put * { x => B1(x) } ); + * <b>def</b> B1(x: a): unit = choice ( get(x) * B0, put * { y => B2(x, y) } ) + * <b>def</b> B2(x: a, y: a): unit = choice ( get(x) * B1(y) ) + * B0 + * } + * </pre> * - * @see <a href="http://scala-lang.org/docu/related.html">PiLib: A Hosted Language for Pi-Calculus Style Concurrency</a> - * @author Vincent Cremet, Martin Odersky - * @version 1.0 + * @see <a href="http://scala-lang.org/docu/papers.html" target="_top"> + * PiLib: A Hosted Language for Pi-Calculus Style Concurrency</a> + * @author Vincent Cremet, Martin Odersky + * @version 1.0 */ object pilib { - /////////////////////////// SPAWN ////////////////////////////// + //////////////////////////////// SPAWN ///////////////////////////////// /** * Run several processes in parallel using the following syntax: - * <code>spawn < p_1 | ... | p_n ></code> + * <code>spawn < p<sub>1</sub> | ... | p<sub>n</sub> ></code> */ abstract class Spawn { def <(p: => unit): Spawn @@ -49,7 +51,7 @@ object pilib { def > : unit = () } - //////////////////////// GUARDED PROCESSES ///////////////////////// + /////////////////////////// GUARDED PROCESSES ////////////////////////// /** Untyped channel. */ class UChan { @@ -71,7 +73,7 @@ object pilib { val untyped = UGP(n, polarity, v, c) } - ////////////////////////// CHANNELS ////////////////////////////// + //////////////////////////////// CHANNELS ////////////////////////////// /** * Name on which one can emit, receive or that can be emitted or received @@ -119,7 +121,7 @@ object pilib { def *[b](f: => b) = c.output(v, () => f) } - //////////////////// SUM OF GUARDED PROCESSES ////////////////////// + /////////////////////// SUM OF GUARDED PROCESSES /////////////////////// case class Sum(gs: List[UGP]) { @@ -147,7 +149,7 @@ object pilib { } } - /////////////////////////// COMMUNICATION ////////////////////////// + ///////////////////////////// COMMUNICATION //////////////////////////// private var sums: List[Sum] = Nil diff --git a/src/manual/scala/man1/scalac.scala b/src/manual/scala/man1/scalac.scala index 3a365bdc7c..fd76ab5f20 100644 --- a/src/manual/scala/man1/scalac.scala +++ b/src/manual/scala/man1/scalac.scala @@ -117,6 +117,12 @@ object scalac extends Command { CmdOption("migrate"), "Assist in migrating from Scala version 1.0."), Definition( + CmdOption("o", Argument("file")), + "Name of the output assembly (only relevant with -target:msil)"), + Definition( + CmdOption("r", Argument("path")), + "List of assemblies referenced by the program (only relevant with -target:msil)"), + Definition( CmdOption("deprecation"), SeqPara( "Indicate whether source should be compiled with deprecation " & @@ -138,7 +144,7 @@ object scalac extends Command { CmdOption("version"), "Print product version and exit."), Definition( - CmdOption("?") & "| " & CmdOption("help"), + /*CmdOption("?") & "| " &*/ CmdOption("help"), "Print a synopsis of standard options."), Definition( CmdOption("nouescape"), @@ -153,6 +159,12 @@ object scalac extends Command { CmdOption("Xcloselim"), "Perform closure elimination."), Definition( + CmdOption("Xdce"), + "Perform dead code elimination"), + Definition( + CmdOption("XbytecodeRead"), + "Enable bytecode reader."), + Definition( CmdOption("Xshowcls", Argument("class")), "Show class info."), Definition( @@ -162,13 +174,38 @@ object scalac extends Command { CmdOption("Xshowicode"), "Print the generated ICode."), Definition( - CmdOption("Xlinearizer", Argument("Xlinearizer")), + CmdOption("Xlinearizer:", Argument("Xlinearizer")), SeqPara( "Linearizer to use (" & Mono("dfs,dump,normal,rpo") & ").", "The default value is " & Mono("\"rpo\"") & ".")), Definition( CmdOption("Xgenerics"), - "Use generic Java types."))), + "Use generic Java types."), + Definition( + CmdOption("Xprintpos"), + "Print tree positions (as offsets)"), + Definition( + CmdOption("Xscript"), + "Compile script file"), + Definition( + CmdOption("Xexperimental"), + "enable experimental extensions"), + /* + Definition( + CmdOption("Xunapply"), + "Enable unapply pattern matching"), + */ + Definition( + CmdOption("Xplugtypes"), + "Parse but ignore annotations in more locations"), + Definition( + CmdOption("Xkilloption"), + "Optimizes option types"), + Definition( + CmdOption("XprintOuterMatches"), + "Prints outer-checks caused by pattern matching") + ) + ), Section("Debug Options", DefinitionList( diff --git a/src/manual/scala/man1/scaladoc.scala b/src/manual/scala/man1/scaladoc.scala index 325f179336..b7acc07f0e 100644 --- a/src/manual/scala/man1/scaladoc.scala +++ b/src/manual/scala/man1/scaladoc.scala @@ -69,10 +69,16 @@ object scaladoc extends Command { CmdOption("d", Argument("directory")), "Specify where to place generated class files."), Definition( + CmdOption("windowtitle", Argument("windowtitle")), + "Specify window title of generated HTML documentation"), + Definition( + CmdOption("documenttitle", Argument("documenttitle")), + "Specify document title of generated HTML documentation"), + Definition( CmdOption("version"), "Print product version and exit."), Definition( - CmdOption("?") & "| " & CmdOption("help"), + /*CmdOption("?") & "| " &*/ CmdOption("help"), "Print a synopsis of standard options.")))) val examples = Section("EXAMPLES", |