diff options
| -rw-r--r-- | src/compiler/scala/tools/ant/Scalac.scala | 9 | ||||
| -rwxr-xr-x | test/scalatest | 2 |
2 files changed, 6 insertions, 5 deletions
diff --git a/src/compiler/scala/tools/ant/Scalac.scala b/src/compiler/scala/tools/ant/Scalac.scala index 6ef3fa50f5..efb19021e5 100644 --- a/src/compiler/scala/tools/ant/Scalac.scala +++ b/src/compiler/scala/tools/ant/Scalac.scala @@ -2,10 +2,11 @@ ** / |/ / ____/ ____/ ** ** / | | /___ / /___ ** ** /_/|__/_____/_____/ Copyright 2005-2006 LAMP/EPFL ** -** -** $Id$ +** ** \* */ +// $Id$ + package scala.tools.ant { import java.lang.System.getProperty @@ -570,7 +571,7 @@ package scala.tools.ant { else List.fromArray(addParams.trim().split(" ")).map(.trim()) while(!args.isEmpty) { val argsBuf = args - if (args.head.startsWith("-")) { + if (args.head startsWith "-") { for (val setting <- settings.allSettings) args = setting.tryToSet(args); } else error("Parameter '" + args.head + "' does not start with '-'.") @@ -588,7 +589,7 @@ package scala.tools.ant { // Compiles the actual code val compiler = new Global(settings, reporter) try { - (new compiler.Run).compile(sourceFiles.map { f:File=>f.toString() }) + (new compiler.Run).compile(sourceFiles.map (.toString())) } catch { case exception: Throwable if (exception.getMessage != null) => exception.printStackTrace() diff --git a/test/scalatest b/test/scalatest index 4f08df7973..515b2df871 100755 --- a/test/scalatest +++ b/test/scalatest @@ -652,7 +652,7 @@ if [ "$TEST_ALL" = "true" ]; then auto | script ) FILES_SCRIPT="$FILES_SCRIPT $SRCDIR/script";; esac; case "$TEST_TYPE" in - auto | ant ) FILES_ANT="$FILES_ANT $SRCDIR/ant";; + ant ) FILES_ANT="$FILES_ANT $SRCDIR/ant";; esac; fi; |