From b94b6f9af69aa73f1b2917414fdcdc2d007f2976 Mon Sep 17 00:00:00 2001 From: michelou Date: Mon, 26 Feb 2007 13:47:22 +0000 Subject: updated tool options in man pages --- src/library/scala/concurrent/pilib.scala | 42 ++++++++++++++++--------------- src/manual/scala/man1/scalac.scala | 43 +++++++++++++++++++++++++++++--- src/manual/scala/man1/scaladoc.scala | 8 +++++- 3 files changed, 69 insertions(+), 24 deletions(-) (limited to 'src') 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 /**

- * Library for using Pi-calculus concurrent primitives in Scala. As an + * Library for using Pi-calculus concurrent primitives in + * Scala. As an * example, the definition of a two-place buffer using the pilib - * library looks like: - * 

- * def Buffer[a](put: Chan[a], get: Chan[a]): unit = {
- *   def B0: unit = choice ( put * { x => B1(x) } );
- *   def B1(x: a): unit = choice ( get(x) * B0, put * { y => B2(x, y) } )
- *   def B2(x: a, y: a): unit = choice ( get(x) * B1(y) )
- *   B0
- * }
- *
+ * library looks like: + * 

+ *  def Buffer[a](put: Chan[a], get: Chan[a]): unit = {
+ *    def B0: unit = choice ( put * { x => B1(x) } );
+ *    def B1(x: a): unit = choice ( get(x) * B0, put * { y => B2(x, y) } )
+ *    def B2(x: a, y: a): unit = choice ( get(x) * B1(y) )
+ *    B0
+ *  }
+ *
* - * @see PiLib: A Hosted Language for Pi-Calculus Style Concurrency - * @author Vincent Cremet, Martin Odersky - * @version 1.0 + * @see + * PiLib: A Hosted Language for Pi-Calculus Style Concurrency + * @author Vincent Cremet, Martin Odersky + * @version 1.0 */ object pilib { - /////////////////////////// SPAWN ////////////////////////////// + //////////////////////////////// SPAWN ///////////////////////////////// /** * Run several processes in parallel using the following syntax: - * spawn < p_1 | ... | p_n > + * spawn < p1 | ... | pn > */ 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 @@ -116,6 +116,12 @@ object scalac extends Command { Definition( 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( @@ -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"), @@ -152,6 +158,12 @@ object scalac extends Command { Definition( 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."), @@ -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 @@ -68,11 +68,17 @@ object scaladoc extends Command { Definition( 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", -- cgit v1.2.3