updated check files

git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@10686 5e8d7ff9-d8ef-0310-90f0-a4852d11357a

build.xml

@@ -1213,7 +1213,7 @@ CLEAN
     <remove dir="${build.dir}"/>
   </target>
 
-  <target name="clean.msil"  depends="ant-init" description="Removes all MSIL build products">
+  <target name="clean.msil" depends="ant-init" description="Removes all MSIL build products">
     <remove dir="${msil.dir}"/>
   </target>
 

src/compiler/scala/tools/nsc/ast/parser/Parsers.scala

@@ -1,5 +1,5 @@
 /* NSC -- new Scala compiler
- * Copyright 2005-2006 LAMP/EPFL
+ * Copyright 2005-2007 LAMP/EPFL
  * @author  Martin Odersky
  */
 // $Id$
@@ -92,7 +92,7 @@ trait Parsers requires SyntaxAnalyzer {
 
 /////// ERROR HANDLING //////////////////////////////////////////////////////
 
-    private def skip(): unit = {
+    private def skip() {
       //System.out.println("<skipping> " + in.token2string(in.token))//DEBUG
       var nparens = 0
       var nbraces = 0
@@ -107,14 +107,14 @@ trait Parsers requires SyntaxAnalyzer {
           case NEWLINES =>
             if (nparens == 0 && nbraces == 0) return
           case RPAREN =>
-            nparens = nparens - 1
+            nparens -= 1
           case RBRACE =>
             if (nbraces == 0) return
-            nbraces = nbraces - 1
+            nbraces -= 1
           case LPAREN =>
-            nparens = nparens + 1
+            nparens += 1
           case LBRACE =>
-            nbraces = nbraces + 1
+            nbraces += 1
           case _ =>
         }
         in.nextToken()
@@ -124,7 +124,7 @@ trait Parsers requires SyntaxAnalyzer {
     def syntaxError(msg: String, skipIt: boolean): unit =
       syntaxError(in.currentPos, msg, skipIt)
 
-    def syntaxError(pos: int, msg: String, skipIt: boolean): unit = {
+    def syntaxError(pos: int, msg: String, skipIt: boolean) {
       if (pos != in.errpos) {
         unit.error(pos, msg)
         in.errpos = pos
@@ -145,7 +145,7 @@ trait Parsers requires SyntaxAnalyzer {
         in.errpos = in.currentPos
       }
     
-    def incompleteInputError(pos: int, msg: String): unit = {
+    def incompleteInputError(pos: int, msg: String) {
       if (pos != in.errpos) {
         unit.incompleteInputError(pos, msg)
         in.errpos = pos
@@ -155,8 +155,8 @@ trait Parsers requires SyntaxAnalyzer {
     def incompleteInputError(msg: String): unit =
       incompleteInputError(in.currentPos, msg)  // in.currentPos should be at the EOF
       
-    def syntaxErrorOrIncomplete(msg: String, skipIt: Boolean): unit = {
-      if(in.token == EOF)
+    def syntaxErrorOrIncomplete(msg: String, skipIt: Boolean) {
+      if (in.token == EOF)
         incompleteInputError(msg)
       else
         syntaxError(in.currentPos, msg, skipIt)
@@ -178,7 +178,7 @@ trait Parsers requires SyntaxAnalyzer {
           in.token2string(token) + " expected but " +
           in.token2string(in.token) + " found."
 
-        if(in.token == EOF)
+        if (in.token == EOF)
           incompleteInputError(posToReport, msg)
         else
           syntaxError(posToReport, msg, true)
@@ -2064,8 +2064,8 @@ trait Parsers requires SyntaxAnalyzer {
      *  TraitTemplateOpt ::= [extends TraitTemplate | TemplateBody]
      */
     def templateOpt(mods: Modifiers, name: Name, constrMods: Modifiers, vparamss: List[List[ValDef]]): (ValDef, Template) = {
-      val pos = in.currentPos;
-      def acceptEmptyTemplateBody(msg: String): unit = {
+      val pos = in.currentPos
+      def acceptEmptyTemplateBody(msg: String) {
         if (in.token == LPAREN && settings.migrate.value)
           syntaxErrorMigrate("traits may not have parameters")
         if (!(isStatSep || in.token == COMMA || in.token == RBRACE || in.token == EOF))

test/files/neg/bug409.check

@@ -1,4 +1,4 @@
-bug409.scala:6: error: `{' expected
+bug409.scala:6: error: ';' expected but '(' found.
 class Toto extends Expr with Case1(12);
                                   ^
 one error found

test/files/neg/bug877.check

@@ -1,4 +1,4 @@
-bug877.scala:3: error: `{' expected
+bug877.scala:3: error: ';' expected but '(' found.
 trait Foo extends A(22A, Bug!) {}
                    ^
 one error found