diff options
author | Martin Odersky <odersky@gmail.com> | 2004-01-28 16:36:29 +0000 |
---|---|---|
committer | Martin Odersky <odersky@gmail.com> | 2004-01-28 16:36:29 +0000 |
commit | 170091b6558ad26180176a826183d7694195b121 (patch) | |
tree | e3c7b4bcb9c9a6395ea8bb8e01e897e85cfa634e | |
parent | 95bd5979f69cdd2f99dcb9ec42ecd416f5bf1148 (diff) | |
download | scala-170091b6558ad26180176a826183d7694195b121.tar.gz scala-170091b6558ad26180176a826183d7694195b121.tar.bz2 scala-170091b6558ad26180176a826183d7694195b121.zip |
*** empty log message ***
-rw-r--r-- | sources/scala/tools/scalac/ast/parser/Scanner.scala | 14 |
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 { |