- Added automatic update of linked tree fields

- Fixed method isType (case Ident and case Select)

1 files changed, 21 insertions, 2 deletions

diff --git a/sources/meta/scalac/ast/MetaTree.java b/sources/meta/scalac/ast/MetaTree.java
index a8ef084b78..461ec184f5 100644
--- a/sources/meta/scalac/ast/MetaTree.java
+++ b/sources/meta/scalac/ast/MetaTree.java
@@ -114,8 +114,17 @@ public class MetaTree extends AbstractTreeExpander {
             }
             writer.println("):");
             writer.indent().print("return ");
-            if (kind != TreeKind.Type) writer.print("!");
-            writer.println("name.isTypeName();").undent();
+            switch (kind) {
+            case TreeKind.Type:
+                writer.print("name.isTypeName() || name == Name.ERROR");
+                break;
+            case TreeKind.Term:
+                writer.print("!name.isTypeName()");
+                break;
+            default:
+                throw new Error("unexpected kind " + kind);
+            }
+            writer.println(";").undent();
         }
 
 	writer.println("default:");
@@ -167,6 +176,16 @@ public class MetaTree extends AbstractTreeExpander {
         writer.print("public Tree setSymbol(").print(tree.t_Symbol).print(" symbol)");
         writer.lbrace();
         writer.println("this.symbol = symbol;");
+        if (node.hasLinkedFields()) {
+            writer.print("if (symbol != null)").lbrace();
+            for (int i = 0; i < node.fields.length; i++) {
+                TreeField field = node.fields[i];
+                TreeFieldLink link = field.link;
+                if (link == null) continue;
+                writer.println("this."+field+" = symbol."+link.getLink()+";");
+            }
+            writer.rbrace();
+        }
         writer.println("return this;");
         writer.rbrace();
         writer.println();