diff options
| author | Martin Odersky <odersky@gmail.com> | 2003-08-04 15:36:09 +0000 |
|---|---|---|
| committer | Martin Odersky <odersky@gmail.com> | 2003-08-04 15:36:09 +0000 |
| commit | 5cbecc3b89757f6996c199e73518b8387d4a5a6a (patch) | |
| tree | 83d6522f8172b62e0bced4c4c312c16939d69f6f /sources/scalac/ast/parser | |
| parent | f014b416aa6099f9031f60f1ccdb19a9ced74382 (diff) | |
| download | scala-5cbecc3b89757f6996c199e73518b8387d4a5a6a.tar.gz scala-5cbecc3b89757f6996c199e73518b8387d4a5a6a.tar.bz2 scala-5cbecc3b89757f6996c199e73518b8387d4a5a6a.zip | |
*** empty log message ***
Diffstat (limited to 'sources/scalac/ast/parser')
| -rw-r--r-- | sources/scalac/ast/parser/Parser.java | 4 | ||||
| -rw-r--r-- | sources/scalac/ast/parser/Scanner.java | 4 | ||||
| -rw-r--r-- | sources/scalac/ast/parser/Tokens.java | 20 |
3 files changed, 10 insertions, 18 deletions
diff --git a/sources/scalac/ast/parser/Parser.java b/sources/scalac/ast/parser/Parser.java index afb5d8abbe..fc544b50d4 100644 --- a/sources/scalac/ast/parser/Parser.java +++ b/sources/scalac/ast/parser/Parser.java @@ -867,10 +867,6 @@ public class Parser implements Tokens { int pos = s.skipToken(); Tree tp = type1(); t = make.Typed(pos, t, tp); - } else if (s.token == AS || s.token == IS) { - Name op = (s.token == AS) ? Names.as : Names.is; - int pos = s.skipToken(); - t = make.TypeApply(pos, make.Select(pos, t, op), new Tree[]{type1()}); } if (s.token == ARROW) { t = make.Function(s.skipToken(), convertToParams(t), expr()); diff --git a/sources/scalac/ast/parser/Scanner.java b/sources/scalac/ast/parser/Scanner.java index 4b070006bc..7ae8840697 100644 --- a/sources/scalac/ast/parser/Scanner.java +++ b/sources/scalac/ast/parser/Scanner.java @@ -129,7 +129,7 @@ public class Scanner extends TokenData { case COMMA: case SEMI: case DOT: case COLON: case EQUALS: case ARROW: case LARROW: case SUBTYPE: case SUPERTYPE: - case HASH: case AT: case AS: case IS: + case HASH: case AT: case RPAREN: case RBRACKET: case RBRACE: break; default: @@ -810,7 +810,6 @@ public class Scanner extends TokenData { protected void initKeywords() { enterKeyword("abstract", ABSTRACT); - enterKeyword("as", AS); enterKeyword("case", CASE); enterKeyword("class", CLASS); enterKeyword("catch", CATCH); @@ -824,7 +823,6 @@ public class Scanner extends TokenData { enterKeyword("for", FOR); enterKeyword("if", IF); enterKeyword("import", IMPORT); - enterKeyword("is", IS); enterKeyword("new", NEW); enterKeyword("null", NULL); enterKeyword("object", OBJECT); diff --git a/sources/scalac/ast/parser/Tokens.java b/sources/scalac/ast/parser/Tokens.java index 9da23bc7e3..3153d4a78d 100644 --- a/sources/scalac/ast/parser/Tokens.java +++ b/sources/scalac/ast/parser/Tokens.java @@ -55,18 +55,16 @@ public interface Tokens { IMPORT = 46, PACKAGE = 47, - AS = 48, - IS = 49, - YIELD = 50, - DO = 51, - TRAIT = 52, - SEALED = 53, + YIELD = 48, + DO = 49, + TRAIT = 50, + SEALED = 51, /* THROW = 54, */ - TRY = 55, - CATCH = 56, - FINALLY = 57, - WHILE = 58, - RETURN = 59, + TRY = 53, + CATCH = 54, + FINALLY = 55, + WHILE = 56, + RETURN = 57, /* special symbols */ COMMA = 61, |