*** empty log message ***

1 files changed, 5 insertions, 9 deletions

diff --git a/sources/scala/tools/scalac/ast/parser/Scanner.scala b/sources/scala/tools/scalac/ast/parser/Scanner.scala
index f890a0a6f6..51c9c9ff16 100644
--- a/sources/scala/tools/scalac/ast/parser/Scanner.scala
+++ b/sources/scala/tools/scalac/ast/parser/Scanner.scala
@@ -125,7 +125,7 @@ class Scanner(_unit: Unit) extends TokenData {
       }
     } else {
       if (next.token == EMPTY) {
-        fetchToken()
+        fetchToken();
       } else {
         copyFrom(next);
         next.token = EMPTY
@@ -348,7 +348,7 @@ class Scanner(_unit: Unit) extends TokenData {
                 nextch(); addCharToDoc(ch);
                 openComments = openComments + 1;
               }
-            } else {
+            } else if (ch != SU) {
               nextch(); addCharToDoc(ch);
             }
           } while ((ch != '*') && (ch != SU));
@@ -356,13 +356,9 @@ class Scanner(_unit: Unit) extends TokenData {
             nextch(); addCharToDoc(ch);
           }
         } while (ch != '/' && ch != SU);
-        if (ch == '/') {
-          nextch();
-          openComments = openComments - 1;
-        } else {
-          syntaxError("unclosed comment");
-          true;
-        }
+        if (ch == '/') nextch();
+	else syntaxError("unclosed comment");
+        openComments = openComments - 1;
       }
       true
     } else {