diff options
Diffstat (limited to 'sources/meta/scalac/ast')
-rw-r--r-- | sources/meta/scalac/ast/MetaTree.java | 4 | ||||
-rw-r--r-- | sources/meta/scalac/ast/Tree.java | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sources/meta/scalac/ast/MetaTree.java b/sources/meta/scalac/ast/MetaTree.java index 74ddd49657..3ae0c9970d 100644 --- a/sources/meta/scalac/ast/MetaTree.java +++ b/sources/meta/scalac/ast/MetaTree.java @@ -117,10 +117,10 @@ public class MetaTree extends AbstractTreeExpander { writer.indent().print("return "); switch (kind) { case TreeKind.Type: - writer.print("name.isTypeName() || name == Name.ERROR"); + writer.print("name.isTypeName() && (symbol() == null || !symbol().isConstructor()) || name == Name.ERROR"); break; case TreeKind.Term: - writer.print("!name.isTypeName()"); + writer.print("name.isTermName() || (symbol() != null && symbol().isConstructor())"); break; default: throw new Error("unexpected kind " + kind); diff --git a/sources/meta/scalac/ast/Tree.java b/sources/meta/scalac/ast/Tree.java index 10948ef5d1..611054180e 100644 --- a/sources/meta/scalac/ast/Tree.java +++ b/sources/meta/scalac/ast/Tree.java @@ -271,7 +271,7 @@ public class Tree { n_TypeApply. setDescription("Type application"). setRange(Phase.PARSER, Phase.END). - addField(t_TermTree, "fun"). + addField(t_Tree, "fun"). addField(t_TypeTrees, "args"); n_Apply. |