diff options
| -rw-r--r-- | src/compiler/scala/tools/nsc/Settings.scala | 10 | ||||
| -rw-r--r-- | test/files/cli/test1/Main.check.scalac | 1 | ||||
| -rw-r--r-- | test/files/cli/test1/Main.check.scalaint | 24 | ||||
| -rw-r--r-- | test/files/cli/test2/Main.check.scalac | 1 | ||||
| -rw-r--r-- | test/files/cli/test2/Main.check.scalaint | 24 | ||||
| -rw-r--r-- | test/files/cli/test3/Main.check.scalac | 1 | ||||
| -rw-r--r-- | test/files/cli/test3/Main.check.scalaint | 24 |
7 files changed, 26 insertions, 59 deletions
diff --git a/src/compiler/scala/tools/nsc/Settings.scala b/src/compiler/scala/tools/nsc/Settings.scala index 129d0dcfaf..16f7acfe45 100644 --- a/src/compiler/scala/tools/nsc/Settings.scala +++ b/src/compiler/scala/tools/nsc/Settings.scala @@ -1,5 +1,5 @@ -/* NSC -- new scala compiler - * Copyright 2005-2006 LAMP/EPFL +/* NSC -- new Scala compiler + * Copyright 2005-2007 LAMP/EPFL * @author Martin Odersky */ // $Id$ @@ -132,7 +132,7 @@ class Settings(error: String => unit) { Xunapply.value = true val Xplugtypes = BooleanSetting("-Xplugtypes", "parse but ignore annotations in more locations") val Xkilloption = BooleanSetting("-Xkilloption", "optimizes option types") - val XprintOuterMatches = BooleanSetting("-XprintOuterMatches", "prints outer-checks caused by pattern matching ") + val XprintOuterMatches = BooleanSetting("-XprintOuterMatches", "prints outer-checks caused by pattern matching") /** A list of all settings */ def allSettings: List[Setting] = allsettings.reverse @@ -220,8 +220,8 @@ class Settings(error: String => unit) { List(name, value) } - /** A setting represented by a string in a given set of `choices', - * (`default' unless set) + /** A setting represented by a string in a given set of <code>choices</code>, + * (<code>default</code> unless set). */ case class ChoiceSetting(nme: String, descr: String, choices: List[String], default: String) extends Setting(nme, descr + choices.mkString(" (", ",", ")")) { diff --git a/test/files/cli/test1/Main.check.scalac b/test/files/cli/test1/Main.check.scalac index e90c2c5d03..a3c0d101fe 100644 --- a/test/files/cli/test1/Main.check.scalac +++ b/test/files/cli/test1/Main.check.scalac @@ -55,5 +55,6 @@ where possible options include: -Xunapply enable unapply pattern matching -Xplugtypes parse but ignore annotations in more locations -Xkilloption optimizes option types + -XprintOuterMatches prints outer-checks caused by pattern matching one error found diff --git a/test/files/cli/test1/Main.check.scalaint b/test/files/cli/test1/Main.check.scalaint index 03dcae101b..073d45354e 100644 --- a/test/files/cli/test1/Main.check.scalaint +++ b/test/files/cli/test1/Main.check.scalaint @@ -21,37 +21,25 @@ Option -Dproperty=value sets a Java system property. This is an interpreter for Scala. Type in expressions to have them evaluated. -Type :quit to exit the interpreter. -Type :compile followed by a filename to compile a complete Scala file. -Type :load followed by a filename to load a sequence of interpreter commands. -Type :replay to reset execution and replay all previous commands. -Type :help to repeat this message later. +Type :help for more information. scala> 1: test 1 passed (1) -line0: scala.Unit = () +line0: scala.Unit = {} scala> This is an interpreter for Scala. Type in expressions to have them evaluated. -Type :quit to exit the interpreter. -Type :compile followed by a filename to compile a complete Scala file. -Type :load followed by a filename to load a sequence of interpreter commands. -Type :replay to reset execution and replay all previous commands. -Type :help to repeat this message later. +Type :help for more information. scala> 1: test 2 passed (1) -line0: scala.Unit = () +line0: scala.Unit = {} scala> This is an interpreter for Scala. Type in expressions to have them evaluated. -Type :quit to exit the interpreter. -Type :compile followed by a filename to compile a complete Scala file. -Type :load followed by a filename to load a sequence of interpreter commands. -Type :replay to reset execution and replay all previous commands. -Type :help to repeat this message later. +Type :help for more information. scala> 1: test 3 passed (1) -line0: scala.Unit = () +line0: scala.Unit = {} scala> diff --git a/test/files/cli/test2/Main.check.scalac b/test/files/cli/test2/Main.check.scalac index e90c2c5d03..a3c0d101fe 100644 --- a/test/files/cli/test2/Main.check.scalac +++ b/test/files/cli/test2/Main.check.scalac @@ -55,5 +55,6 @@ where possible options include: -Xunapply enable unapply pattern matching -Xplugtypes parse but ignore annotations in more locations -Xkilloption optimizes option types + -XprintOuterMatches prints outer-checks caused by pattern matching one error found diff --git a/test/files/cli/test2/Main.check.scalaint b/test/files/cli/test2/Main.check.scalaint index 94b353e5b9..5eec5e231a 100644 --- a/test/files/cli/test2/Main.check.scalaint +++ b/test/files/cli/test2/Main.check.scalaint @@ -21,37 +21,25 @@ Option -Dproperty=value sets a Java system property. This is an interpreter for Scala. Type in expressions to have them evaluated. -Type :quit to exit the interpreter. -Type :compile followed by a filename to compile a complete Scala file. -Type :load followed by a filename to load a sequence of interpreter commands. -Type :replay to reset execution and replay all previous commands. -Type :help to repeat this message later. +Type :help for more information. scala> 2: 1: test 1 passed (1) -line0: scala.Unit = () +line0: scala.Unit = {} scala> This is an interpreter for Scala. Type in expressions to have them evaluated. -Type :quit to exit the interpreter. -Type :compile followed by a filename to compile a complete Scala file. -Type :load followed by a filename to load a sequence of interpreter commands. -Type :replay to reset execution and replay all previous commands. -Type :help to repeat this message later. +Type :help for more information. scala> 2: 1: test 2 passed (1) -line0: scala.Unit = () +line0: scala.Unit = {} scala> This is an interpreter for Scala. Type in expressions to have them evaluated. -Type :quit to exit the interpreter. -Type :compile followed by a filename to compile a complete Scala file. -Type :load followed by a filename to load a sequence of interpreter commands. -Type :replay to reset execution and replay all previous commands. -Type :help to repeat this message later. +Type :help for more information. scala> 2: 1: test 3 passed (1) -line0: scala.Unit = () +line0: scala.Unit = {} scala> diff --git a/test/files/cli/test3/Main.check.scalac b/test/files/cli/test3/Main.check.scalac index e90c2c5d03..a3c0d101fe 100644 --- a/test/files/cli/test3/Main.check.scalac +++ b/test/files/cli/test3/Main.check.scalac @@ -55,5 +55,6 @@ where possible options include: -Xunapply enable unapply pattern matching -Xplugtypes parse but ignore annotations in more locations -Xkilloption optimizes option types + -XprintOuterMatches prints outer-checks caused by pattern matching one error found diff --git a/test/files/cli/test3/Main.check.scalaint b/test/files/cli/test3/Main.check.scalaint index 4343b29a09..acb76f19d8 100644 --- a/test/files/cli/test3/Main.check.scalaint +++ b/test/files/cli/test3/Main.check.scalaint @@ -21,40 +21,28 @@ Option -Dproperty=value sets a Java system property. This is an interpreter for Scala. Type in expressions to have them evaluated. -Type :quit to exit the interpreter. -Type :compile followed by a filename to compile a complete Scala file. -Type :load followed by a filename to load a sequence of interpreter commands. -Type :replay to reset execution and replay all previous commands. -Type :help to repeat this message later. +Type :help for more information. scala> 3: 1: test 1 passed (1) 3: 2: 1: test 1 passed (1) -line0: scala.Unit = () +line0: scala.Unit = {} scala> This is an interpreter for Scala. Type in expressions to have them evaluated. -Type :quit to exit the interpreter. -Type :compile followed by a filename to compile a complete Scala file. -Type :load followed by a filename to load a sequence of interpreter commands. -Type :replay to reset execution and replay all previous commands. -Type :help to repeat this message later. +Type :help for more information. scala> 3: 1: test 2 passed (1) 3: 2: 1: test 2 passed (1) -line0: scala.Unit = () +line0: scala.Unit = {} scala> This is an interpreter for Scala. Type in expressions to have them evaluated. -Type :quit to exit the interpreter. -Type :compile followed by a filename to compile a complete Scala file. -Type :load followed by a filename to load a sequence of interpreter commands. -Type :replay to reset execution and replay all previous commands. -Type :help to repeat this message later. +Type :help for more information. scala> 3: 1: test 3 passed (1) 3: 2: 1: test 3 passed (1) -line0: scala.Unit = () +line0: scala.Unit = {} scala> |