diff options
| -rw-r--r-- | sources/scalac/ast/Tree.java.tmpl | 11 | ||||
| -rw-r--r-- | sources/scalac/typechecker/RefCheck.java | 5 |
2 files changed, 4 insertions, 12 deletions
diff --git a/sources/scalac/ast/Tree.java.tmpl b/sources/scalac/ast/Tree.java.tmpl index 937d9e212c..e7e23e54a5 100644 --- a/sources/scalac/ast/Tree.java.tmpl +++ b/sources/scalac/ast/Tree.java.tmpl @@ -47,17 +47,6 @@ public class Tree { {#IsKind#} - /** Returns true if this tree is empty or error. */ - public boolean isMissing() { - switch (this) { - case Bad(): - case Empty: - return true; - default: - return false; - } - } - //######################################################################## // Public Methods - tree type diff --git a/sources/scalac/typechecker/RefCheck.java b/sources/scalac/typechecker/RefCheck.java index b77d96563e..92290a4317 100644 --- a/sources/scalac/typechecker/RefCheck.java +++ b/sources/scalac/typechecker/RefCheck.java @@ -867,7 +867,7 @@ public class RefCheck extends Transformer implements Modifiers, Kinds { // Tree node simplification--------------------------------------------------- private Tree elimTypeNode(Tree tree) { - if (tree.isType() && !tree.isMissing()) + if (tree.isType()) return gen.mkType(tree.pos, tree.type.deconst()); else return tree; @@ -930,6 +930,9 @@ public class RefCheck extends Transformer implements Modifiers, Kinds { public Tree transform(Tree tree) { Symbol sym = tree.symbol(); switch (tree) { + case Empty: + return tree; + case ClassDef(_, _, Tree.AbsTypeDef[] tparams, Tree.ValDef[][] vparams, Tree tpe, Tree.Template templ): Symbol enclClassPrev = enclClass; enclClass = sym; |