diff options
Diffstat (limited to 'sources/scalac/ast/parser')
| -rw-r--r-- | sources/scalac/ast/parser/Parser.java | 8 | ||||
| -rw-r--r-- | sources/scalac/ast/parser/Scanner.java | 1 |
2 files changed, 2 insertions, 7 deletions
diff --git a/sources/scalac/ast/parser/Parser.java b/sources/scalac/ast/parser/Parser.java index eb5d31426c..99610f4843 100644 --- a/sources/scalac/ast/parser/Parser.java +++ b/sources/scalac/ast/parser/Parser.java @@ -1637,26 +1637,22 @@ public class Parser implements Tokens { /** ObjectDef ::= Id [`:' SimpleType] ClassTemplate */ Tree objectDef(int mods) { - return make.ObjectDef( + return make.ModuleDef( s.pos, mods, ident(), simpleTypedOpt(), classTemplate()); } - /** ClassTemplate ::= `extends' Template - * | TemplateBody - * | + /** ClassTemplate ::= [`extends' Constr] {`with' Constr} [TemplateBody] */ Template classTemplate() { int pos = s.pos; if (s.token == EXTENDS) { s.nextToken(); return template(); -/* } else if (s.token == WITH) { s.nextToken(); TreeList parents = new TreeList(); parents.append(scalaObjectConstr(pos)); return template(parents); -*/ } else if (s.token == LBRACE) { return (Template)make.Template( pos, new Tree[]{scalaObjectConstr(pos)}, templateBody()); diff --git a/sources/scalac/ast/parser/Scanner.java b/sources/scalac/ast/parser/Scanner.java index e2a95d3dbf..7d180b3ef3 100644 --- a/sources/scalac/ast/parser/Scanner.java +++ b/sources/scalac/ast/parser/Scanner.java @@ -491,7 +491,6 @@ public class Scanner extends TokenData { name = Name.fromAscii(buf, start, end - start); if (name.index <= maxKey) { token = key[name.index]; - if (token == OBJECT1) token = OBJECT; //todo: elim } else token = IDENTIFIER; |