diff options
| author | Martin Odersky <odersky@gmail.com> | 2003-12-02 10:25:23 +0000 |
|---|---|---|
| committer | Martin Odersky <odersky@gmail.com> | 2003-12-02 10:25:23 +0000 |
| commit | 3a4e72367ec151c5d8379af408bf72c594f8605d (patch) | |
| tree | 4e86b89b62c4b6850ae9b0f435fa1aae1cd0b428 /sources/scalac/ast | |
| parent | 142bcb34f745cca56542a0f7f334cbc3b91d033d (diff) | |
| download | scala-3a4e72367ec151c5d8379af408bf72c594f8605d.tar.gz scala-3a4e72367ec151c5d8379af408bf72c594f8605d.tar.bz2 scala-3a4e72367ec151c5d8379af408bf72c594f8605d.zip | |
*** empty log message ***
Diffstat (limited to 'sources/scalac/ast')
| -rw-r--r-- | sources/scalac/ast/parser/Scanner.java | 28 |
1 files changed, 11 insertions, 17 deletions
diff --git a/sources/scalac/ast/parser/Scanner.java b/sources/scalac/ast/parser/Scanner.java index ae8a9ba187..8e0f57a2fb 100644 --- a/sources/scalac/ast/parser/Scanner.java +++ b/sources/scalac/ast/parser/Scanner.java @@ -221,21 +221,11 @@ public class Scanner extends TokenData { return; case '~': case '!': case '@': case '#': case '%': case '^': case '*': case '+': case '-': case '<': - case '>': case '?': case ':': + case '>': case '?': case ':': case '\\': case '=': case '&': case '|': nextch(); getOperatorRest(index); return; - case '\\': - nextch(); - if (ch == '"') { - getStringLit(); - token = IDENTIFIER; - } else { - syntaxError(pos, "illegal character"); - } - return; - case '/': nextch(); if (!skipComment()) { @@ -259,8 +249,12 @@ public class Scanner extends TokenData { case '5': case '6': case '7': case '8': case '9': getNumber(index, 10); return; + case '`': + getStringLit('`'); + token = IDENTIFIER; + return; case '\"': - getStringLit(); + getStringLit('\"'); return; case '\'': nextch(); @@ -438,7 +432,7 @@ public class Scanner extends TokenData { switch (ch) { case '~': case '!': case '@': case '#': case '%': case '^': case '*': case '+': case '-': case '<': - case '>': case '?': case ':': + case '>': case '?': case ':': case '\\': case '=': case '&': case '|': nextch(); break; @@ -482,7 +476,7 @@ public class Scanner extends TokenData { return; case '~': case '!': case '@': case '#': case '%': case '^': case '*': case '+': case '-': case '<': - case '>': case '?': case ':': + case '>': case '?': case ':': case '\\': case '=': case '&': case '|': case '/': getOperatorRest(index); @@ -497,12 +491,12 @@ public class Scanner extends TokenData { } } - private void getStringLit() { + private void getStringLit(char delimiter) { nextch(); litlen = 0; - while (ch != '\"' && ch != CR && ch != LF && ch != SU) + while (ch != delimiter && ch != CR && ch != LF && ch != SU) getlitch(); - if (ch == '\"') { + if (ch == delimiter) { token = STRINGLIT; name = Name.fromSource(lit, 0, litlen); nextch(); |