X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2Fmeta%2FGrammarAST.java;h=0b4ba07d9d21cc74210d2cc4ffd863bf9d7069a5;hp=63c43920805f96df7274c2a18b2668d2d5c9dc52;hb=f05128e0aee9894a93455dd425ed6104a90a3999;hpb=f17fca21d99030d325624f839efcd17bc93f1548
diff --git a/src/edu/berkeley/sbp/meta/GrammarAST.java b/src/edu/berkeley/sbp/meta/GrammarAST.java
index 63c4392..0b4ba07 100644
--- a/src/edu/berkeley/sbp/meta/GrammarAST.java
+++ b/src/edu/berkeley/sbp/meta/GrammarAST.java
@@ -1,4 +1,4 @@
-// Copyright 2006 all rights reserved; see LICENSE file for BSD-style license
+// Copyright 2006-2007 all rights reserved; see LICENSE file for BSD-style license
package edu.berkeley.sbp.meta;
import edu.berkeley.sbp.util.*;
@@ -10,26 +10,23 @@ import java.lang.annotation.*;
import java.lang.reflect.*;
import java.io.*;
-// FIXME: deal with question-marks
+/**
+ * The inner classes of this class represent nodes in the Abstract
+ * Syntax Tree of a grammar.
+ */
+public class GrammarAST {
-// FIXME: put back in associativity: ^")"
-// A = A "->" (A)
-// means that the FIRST "A" cannot match the SAME sequence in
-// which the (A) occurs
-// -- and add a test case
-
-// FIXME: make it so that we can have multi-result nonterminals
-// so long as they always appear under double-colons?
-// auto-insert the unwrap?
-
-// FIXME: put associativity back in
-
-// FIXME: "flat" sequences (no subtrees contain "::"s?)
-
-// freezing problem is related to comments in grammar files
+ public static interface ImportResolver {
+ public InputStream getImportStream(String importname);
+ }
-/** The java classes typically used to represent a parsed grammar AST; each inner class is a type of AST node. */
-public class GrammarBuilder {
+ /**
+ * Returns a Union representing the metagrammar (meta.g); the Tree produced by
+ * parsing with this Union should be provided to buildFromAST
+ */
+ public static Union getMetaGrammar() {
+ return buildFromAST(MetaGrammar.meta, "s", null);
+ }
/**
* Create a grammar from a parse tree and binding resolver
@@ -38,36 +35,46 @@ public class GrammarBuilder {
* @param s the name of the "start symbol"
* @param gbr a GrammarBindingResolver that resolves grammatical reductions into tree-node-heads
*/
- public static Union buildFromAST(Tree grammarAST, String startingNonterminal, File[] includes) {
- return new GrammarAST(includes, "").buildGrammar(grammarAST, startingNonterminal);
+ public static Union buildFromAST(Tree grammarAST, String startingNonterminal, ImportResolver resolver) {
+ return new GrammarAST(resolver, "").buildGrammar(grammarAST, startingNonterminal);
}
- public static Object illegalTag = ""; // this is the tag that should never appear in the non-dropped output FIXME
+ /** This does not work yet */
+ public static void emitCode(PrintWriter pw, Tree grammarAST, String startingNonterminal, ImportResolver resolver) {
+ GrammarAST ga = new GrammarAST(resolver, "");
+ Object o = ga.walk(grammarAST);
+ GrammarAST.GrammarNode gn = (GrammarAST.GrammarNode)o;
+ EmitContext ecx = ga.new EmitContext(gn);
+ gn.emitCode(ecx, pw, "com.foo", "ClassName");
+ }
+
+ private static Object illegalTag = ""; // this is the tag that should never appear in the non-dropped output FIXME
+
+ // Instance //////////////////////////////////////////////////////////////////////////////
private final String prefix;
- private final File[] includes;
+ private final ImportResolver resolver;
- public GrammarAST(File[] includes, String prefix) {
+ public GrammarAST(ImportResolver resolver, String prefix) {
this.prefix = prefix;
- this.includes = includes;
+ this.resolver = resolver;
}
// Methods //////////////////////////////////////////////////////////////////////////////
private Union buildGrammar(Tree t, String rootNonTerminal) {
- return ((GrammarAST.GrammarNode)walk(t)).build(rootNonTerminal);
+ Object o = walk(t);
+ if (o instanceof Union) return (Union)o;
+ return ((GrammarAST.GrammarNode)o).build(rootNonTerminal);
}
- public Object[] walkChildren(Tree t) {
+ private Object[] walkChildren(Tree t) {
Object[] ret = new Object[t.size()];
- for(int i=0; i 0)
head = head.substring(head.indexOf('.')+1);
@@ -92,89 +102,85 @@ public class GrammarBuilder {
if (head.equals("Grammar")) return new GrammarNode(walkChildren(t));
if (head.equals("(")) return new UnionNode((Seq[][])walkChildren(t.child(0)));
if (head.equals("Word")) return stringifyChildren(t);
- if (head.equals("Elements")) return seq2((ElementNode[])Reflection.rebuild(walkChildren(t), ElementNode[].class));
+ if (head.equals("Elements")) return new Seq((ElementNode[])Reflection.rebuild(walkChildren(t), ElementNode[].class));
if (head.equals("NonTerminalReference")) return new ReferenceNode(stringifyChildren(t.child(0)));
- //if (head.equals(")")) return new ReferenceNode(stringifyChildren(t.child(0)));
- if (head.equals("{")) return new XTree((Seq)walk(t.child(0)));
- if (head.equals("::")) return tag((String)walk(t.child(0)), (Seq)walk(t.child(1)));
- if (head.equals("++")) return plusmax((ElementNode)walk(t.child(0)));
- if (head.equals("...")) return star(new TildeNode(new AtomNode()));
- if (head.equals("+")) return plus((ElementNode)walk(t.child(0)));
- if (head.equals("++/")) return plusmaxfollow((ElementNode)walk(t.child(0)), (ElementNode)walk(t.child(1)));
- if (head.equals("+/")) return plusfollow((ElementNode)walk(t.child(0)), (ElementNode)walk(t.child(1)));
- if (head.equals("**")) return starmax((ElementNode)walk(t.child(0)));
- if (head.equals("*")) return star((ElementNode)walk(t.child(0)));
- if (head.equals("**/")) return starmaxfollow((ElementNode)walk(t.child(0)), (ElementNode)walk(t.child(1)));
- if (head.equals("*/")) return starfollow((ElementNode)walk(t.child(0)), (ElementNode)walk(t.child(1)));
- if (head.equals("?")) return question((ElementNode)walk(t.child(0)));
- if (head.equals("!")) return new DropNode((ElementNode)walk(t.child(0)));
- if (head.equals("^")) return new LiteralNode((String)walk(t.child(0)), true);
- if (head.equals("`")) {
- ElementNode ret = (ElementNode)walk(t.child(0));
- ret.lifted = true;
- return ret;
- }
+ if (head.equals(")")) return new ReferenceNode(stringifyChildren(t.child(0)), true);
+ if (head.equals(":")) return new LabelNode(stringifyChildren(t.child(0)), walkElement(t.child(1)));
+ if (head.equals("::")) return walkSeq(t.child(1)).tag(walkString(t.child(0)));
+ if (head.equals("...")) return new DropNode(new RepeatNode(new TildeNode(new AtomNode()), null, true, true, false));
+
+ if (head.equals("++")) return new RepeatNode(walkElement(t.child(0)), null, false, true, true);
+ if (head.equals("+")) return new RepeatNode(walkElement(t.child(0)), null, false, true, false);
+ if (head.equals("++/")) return new RepeatNode(walkElement(t.child(0)), walkElement(t.child(1)), false, true, true);
+ if (head.equals("+/")) return new RepeatNode(walkElement(t.child(0)), walkElement(t.child(1)), false, true, false);
+ if (head.equals("**")) return new RepeatNode(walkElement(t.child(0)), null, true, true, true);
+ if (head.equals("*")) return new RepeatNode(walkElement(t.child(0)), null, true, true, false);
+ if (head.equals("**/")) return new RepeatNode(walkElement(t.child(0)), walkElement(t.child(1)), true, true, true);
+ if (head.equals("*/")) return new RepeatNode(walkElement(t.child(0)), walkElement(t.child(1)), true, true, false);
+ if (head.equals("?")) return new RepeatNode(walkElement(t.child(0)), null, true, false, false);
+
+ if (head.equals("!")) return new DropNode(walkElement(t.child(0)));
+ if (head.equals("^")) return new LiteralNode(walkString(t.child(0)), true);
+ if (head.equals("`")) return new BacktickNode(walkElement(t.child(0)));
if (head.equals("Quoted")) return stringifyChildren(t);
- if (head.equals("Literal")) return new LiteralNode((String)walk(t.child(0)));
- if (head.equals("->")) return arrow((Seq)walk(t.child(0)), (ElementNode)walk(t.child(1)));
- if (head.equals("DropNT")) return new NonTerminalNode((String)walk(t.child(0)), (Seq[][])walkChildren(t.child(1)), false, null, true);
- if (head.equals("=") && t.size()==2) return new NonTerminalNode((String)walk(t.child(0)), (Seq[][])walk(t.child(1)), true, null, false);
- if (head.equals("=")) return new NonTerminalNode((String)walk(t.child(0)), (Seq[][])walk(t.child(2)), true, (String)walk(t.child(1)), false);
- if (head.equals("&")) return and2((Seq)walk(t.child(0)), (Seq)walk(t.child(1)));
- if (head.equals("&~")) return andnot2((Seq)walk(t.child(0)), (Seq)walk(t.child(1)));
- if (head.equals("/")) return ((Seq)walk(t.child(0))).separate((ElementNode)walk(t.child(1)));
- if (head.equals("()")) return epsilon;
- if (head.equals("[")) return new AtomNode((AtomNodeRange[])Reflection.rebuild(walkChildren(t), AtomNodeRange[].class));
- if (head.equals("\\{")) return new DropNode(new AtomNode(new AtomNodeRange(CharAtom.left, CharAtom.left)));
- if (head.equals("\\}")) return new DropNode(new AtomNode(new AtomNodeRange(CharAtom.right, CharAtom.right)));
- if (head.equals("~")) return new TildeNode((ElementNode)walk(t.child(0)));
- if (head.equals("~~")) {
- Seq seq = new Seq(star(new TildeNode(new AtomNode())));
- return seq.andnot((Seq)walk(t.child(0)));
- }
- if (head.equals("Range") && t.size()==1) return new AtomNodeRange(unescape(t).charAt(0));
- if (head.equals("Range")) return new AtomNodeRange(unescape(t).charAt(0), unescape(t).charAt(1));
+ if (head.equals("Literal")) return new LiteralNode(walkString(t.child(0)));
+ if (head.equals("->")) return walkSeq(t.child(0)).follow(walkElement(t.child(1)));
+ if (head.equals("DropNT")) return new NonTerminalNode(walkString(t.child(0)), (Seq[][])walkChildren(t.child(1)), false, null, true, false);
+ if (head.equals("=")) return new NonTerminalNode(walkString(t.child(0)), (Seq[][])walk(t.child(2)),
+ true, t.size()==2 ? null : walkString(t.child(1)), false, false);
+ if (head.equals("&")) return walkSeq(t.child(0)).and(walkSeq(t.child(1)));
+ if (head.equals("&~")) return walkSeq(t.child(0)).andnot(walkSeq(t.child(1)));
+ if (head.equals("/")) return (walkSeq(t.child(0))).separate(walkElement(t.child(1)));
+ if (head.equals("()")) return new LiteralNode("");
+ if (head.equals("[")) return new AtomNode((char[][])Reflection.rebuild(walkChildren(t), char[][].class));
+ if (head.equals("\\{")) return new DropNode(new AtomNode(new char[] { CharAtom.left, CharAtom.left }));
+ if (head.equals("\\}")) return new DropNode(new AtomNode(new char[] { CharAtom.right, CharAtom.right }));
+ if (head.equals(">>")) return new DropNode(new AtomNode(new char[] { CharAtom.left, CharAtom.left }));
+ if (head.equals("<<")) return new DropNode(new AtomNode(new char[] { CharAtom.right, CharAtom.right }));
+ if (head.equals("~")) return new TildeNode(walkElement(t.child(0)));
+ if (head.equals("~~")) return new Seq(new RepeatNode(new TildeNode(new AtomNode()), null, true, true, false)).andnot(walkSeq(t.child(0)));
+ if (head.equals("Range")) {
+ if (t.size()==2 && ">".equals(t.child(0).head())) return new char[] { CharAtom.left, CharAtom.left };
+ if (t.size()==2 && "<".equals(t.child(0).head())) return new char[] { CharAtom.right, CharAtom.right };
+ if (t.size()==1) return new char[] { unescape(t).charAt(0), unescape(t).charAt(0) };
+ return new char[] { unescape(t).charAt(0), unescape(t).charAt(1) };
+ }
if (head.equals("\"\"")) return "";
- if (head.equals("\n")) return "\n";
- if (head.equals("\r")) return "\r";
- if (head.equals("grammar.Grammar")) return walkChildren(t);
- if (head.equals("SubGrammar")) return GrammarBuilder.buildFromAST(t.child(0), "s", includes);
+ if (head.equals("\n")) return "\n";
+ if (head.equals("\t")) return "\t";
+ if (head.equals("\r")) return "\r";
+ if (head.equals("SubGrammar")) return GrammarAST.buildFromAST(t.child(0), "s", resolver);
if (head.equals("NonTerminal"))
- return new NonTerminalNode((String)walk(t.child(0)),
- (Seq[][])walkChildren(t.child(1)), false, null, false);
+ return new NonTerminalNode(walkString(t.child(0)),
+ (Seq[][])walkChildren(t.child(1)), false, null, false, false);
if (head.equals("Colons")) {
- String tag = (String)walk(t.child(0));
+ String tag = walkString(t.child(0));
Seq[][] seqs = (Seq[][])walk(t.child(1));
for(Seq[] seq : seqs)
for(int i=0; i " + (head.equals("...")));
}
+
// Nodes //////////////////////////////////////////////////////////////////////////////
@@ -208,98 +214,124 @@ public class GrammarBuilder {
return ret + " ]";
}
public Union build(String rootNonterminal) {
- Context cx = new Context(this);
+ BuildContext cx = new BuildContext(this);
Union u = null;
- for(GrammarBuilder.NonTerminalNode nt : values())
+ for(GrammarAST.NonTerminalNode nt : values())
if (nt.name.equals(rootNonterminal))
return (Union)cx.get(nt.name);
return null;
}
- }
-
- public class UnionNode extends ElementNode {
- public Seq[][] sequences;
- public String sep = null;
- public boolean rep;
- public UnionNode(Seq[][] sequences) { this(sequences, false, null); }
- public UnionNode(Seq[][] sequences, boolean rep, String sep) {
- this.sequences = sequences;
- this.rep = rep;
- this.sep = sep;
- }
- public Atom toAtom(Context cx) {
- Atom ret = null;
- for(Seq[] ss : sequences)
- for(Seq s : ss)
- ret = ret==null ? s.toAtom(cx) : (Atom)ret.union(s.toAtom(cx));
- return ret;
- }
- public Element build(Context cx, NonTerminalNode cnt, boolean dropall) {
- return buildIntoPreallocatedUnion(cx, cnt, dropall, new Union(null, false)); }
- public Element buildIntoPreallocatedUnion(Context cx, NonTerminalNode cnt, boolean dropall, Union u) {
- Union urep = null;
- if (rep) {
- urep = new Union(null, false);
- urep.add(Sequence.create(new Element[0], cnt.name));
- urep.add(sep==null
- ? Sequence.create(new Element[] { u }, 0)
- : Sequence.create(new Element[] { cx.get(sep), u }, 1));
- }
- HashSet bad2 = new HashSet();
- for(int i=0; i= 'A' && nt.name.charAt(0) <= 'Z')) continue;
+ StringBuffer fieldDeclarations = new StringBuffer();
+ StringBuffer walkCode = new StringBuffer();
+ nt.getUnionNode().emitCode(cx, fieldDeclarations, walkCode);
+ if (nt.tagged) {
+ pw.println(" public static class " + nt.name + "{");
+ pw.println(fieldDeclarations);
+ pw.println(" }");
+ pw.println(" public static " + nt.name + " walk"+nt.name+"(Tree t) {");
+ pw.println(" int i = 0;");
+ pw.println(walkCode);
+ pw.println(" }");
+ } else {
+ // FIXME; list who extends it
+ pw.println(" public static interface " + nt.name + "{ }");
+ // FIXME: what on earth is this going to be?
+ pw.println(" public static " + nt.name + " walk"+nt.name+"(Tree t) {");
+ pw.println(" throw new Error(\"FIXME\");");
+ pw.println(" }");
+ }
}
- return u;
+ pw.println("}");
}
}
- public class NonTerminalNode extends UnionNode {
- public boolean alwaysDrop;
- public String name = null;
- public boolean drop(Context cx) { return alwaysDrop; }
- public NonTerminalNode(String name, Seq[][] sequences, boolean rep, String sep, boolean alwaysDrop) {
- super(sequences, rep, sep==null?null:(prefix + sep));
+ /** a NonTerminal is always a union at the top level */
+ private class NonTerminalNode {
+ public final boolean alwaysDrop;
+ public final String name;
+ public final ElementNode elementNode;
+ public final UnionNode unionNode;
+ public final boolean tagged;
+ public NonTerminalNode(String name, Seq[][] sequences, boolean rep, String sep, boolean alwaysDrop, boolean tagged) {
this.name = prefix + name;
this.alwaysDrop = alwaysDrop;
+ this.tagged = tagged;
+ this.unionNode = new UnionNode(sequences, rep, sep==null?null:(prefix + sep));
+ this.elementNode = alwaysDrop ? new DropNode(unionNode) : unionNode;
}
- public Element build(Context cx, NonTerminalNode cnt, boolean dropall) { return cx.get(name); }
+ public boolean isDropped(Context cx) { return alwaysDrop; }
+ public Element build(BuildContext cx, NonTerminalNode cnt, boolean dropall) { return cx.get(name); }
+ public ElementNode getElementNode() { return elementNode; }
+ public UnionNode getUnionNode() { return unionNode; }
}
- public class Seq {
- public boolean alwaysDrop = false;
- public boolean drop(Context cx) { return alwaysDrop; }
- HashSet and = new HashSet();
- HashSet not = new HashSet();
+ /** a sequence */
+ private class Seq {
+ /** elements of the sequence */
ElementNode[] elements;
+ /** follow-set, if explicit */
ElementNode follow;
+ /** tag to add when building the AST */
String tag = null;
- public Seq(ElementNode e) { this(new ElementNode[] { e }); }
- public Seq(ElementNode[] elements) {
- this.elements = elements;
+ /** positive conjuncts */
+ HashSet and = new HashSet();
+ /** negative conjuncts */
+ HashSet not = new HashSet();
+ public boolean alwaysDrop = false;
+
+ public boolean isTagless() {
+ if (alwaysDrop) return true;
for(int i=0; i, **, ++, or a similar character-class"+
" operator on a [potentially] multicharacter production");
@@ -307,16 +339,8 @@ public class GrammarBuilder {
}
public Seq tag(String tag) { this.tag = tag; return this; }
public Seq follow(ElementNode follow) { this.follow = follow; return this; }
- public Seq and(Seq s) { and.add(s); return this; }
- public Seq andnot(Seq s) { not.add(s); return this; }
- public Seq dup() {
- Seq ret = new Seq(elements);
- ret.and.addAll(and);
- ret.not.addAll(not);
- ret.follow = follow;
- ret.tag = tag;
- return ret;
- }
+ public Seq and(Seq s) { and.add(s); s.alwaysDrop = true; return this; }
+ public Seq andnot(Seq s) { not.add(s); s.alwaysDrop = true; return this; }
public Seq separate(ElementNode sep) {
ElementNode[] elements = new ElementNode[this.elements.length * 2 - 1];
for(int i=0; i 0 && elements[0].lifted)
- lift = true;
+ throw new RuntimeException("multiple non-dropped elements in sequence: " + Sequence.create("", els));
+ boolean[] lifts = new boolean[elements.length];
+ for(int i=0; i cl = new HashSet ();
+ for(Seq[] ss : sequences)
+ for(Seq s : ss) {
+ /*
+ String cls = s.getEmitClass();
+ if (cls != null) cl.add(cls);
+ */
+ }
+ return (String[])cl.toArray(new String[0]);
+ }
+
+ public void _emitCode(EmitContext cx,
+ StringBuffer fieldDeclarations,
+ StringBuffer walkCode) {
+ throw new RuntimeException("not implemented " + this.getClass().getName());
+ }
+
+ public String getFieldName() { return null; }
+ public boolean isLifted() { return false; }
+ public boolean isDropped(Context cx) {
+ for(Seq[] seqs : sequences)
+ for(Seq seq : seqs)
+ if (!seq.isDropped(cx))
+ return false;
+ return true;
+ }
+ public Atom toAtom(BuildContext cx) {
+ Atom ret = null;
+ for(Seq[] ss : sequences)
+ for(Seq s : ss)
+ ret = ret==null ? s.toAtom(cx) : (Atom)ret.union(s.toAtom(cx));
+ return ret;
+ }
+
+ public Element build(BuildContext cx, NonTerminalNode cnt, boolean dropall) {
+ return buildIntoPreallocatedUnion(cx, cnt, dropall, new Union(null, false)); }
+ public Element buildIntoPreallocatedUnion(BuildContext cx, NonTerminalNode cnt, boolean dropall, Union u) {
+ Union urep = null;
+ if (rep) {
+ urep = new Union(null, false);
+ urep.add(Sequence.create(cnt.name, new Element[0]));
+ urep.add(sep==null
+ ? Sequence.create(new Element[] { u }, 0)
+ : Sequence.create(new Element[] { cx.get(sep), u }, 1));
+ }
+ HashSet bad2 = new HashSet();
+ for(int i=0; i)_e.toAtom(cx).complement()); }
- public Element build(Context cx, NonTerminalNode cnt, boolean dropall) { return toAtom(cx); }
+ public Atom toAtom(BuildContext cx) { return (Atom)((Topology)_e.toAtom(cx).complement()); }
+ public Element build(BuildContext cx, NonTerminalNode cnt, boolean dropall) { return toAtom(cx); }
}
- public class DropNode extends ElementNodeWrapper {
+ private class DropNode extends ElementNodeWrapper {
public DropNode(ElementNode e) { super(e); }
- public boolean drop(Context cx) { return true; }
+ public boolean isDropped(Context cx) { return true; }
}
- public Seq and2(Seq s, Seq a) { a.alwaysDrop = true; return s.and(a); }
- public Seq andnot2(Seq s, Seq a) { a.alwaysDrop = true; return s.andnot(a); }
- public Seq arrow(Seq s, ElementNode e) { return s.follow(e); }
- public Seq tag(String tagname, Seq s) { return s.tag(tagname); }
- public Seq seq(ElementNode[] elements) { return new Seq(elements); }
- public Seq seq2(ElementNode[] elements) { return new Seq(elements); }
- public ElementNode plusmax(final ElementNode e) { return new RepeatNode(e, null, false, true, true); }
- public ElementNode plus(final ElementNode e) { return new RepeatNode(e, null, false, true, false); }
- public ElementNode plusmaxfollow(final ElementNode e, final ElementNode sep) { return new RepeatNode(e, sep, false, true, true); }
- public ElementNode plusfollow(final ElementNode e, final ElementNode sep) { return new RepeatNode(e, sep, false, true, false); }
- public ElementNode starmax(final ElementNode e) { return new RepeatNode(e, null, true, true, true); }
- public ElementNode star(final ElementNode e) { return new RepeatNode(e, null, true, true, false); }
- public ElementNode starmaxfollow(final ElementNode e, final ElementNode sep) { return new RepeatNode(e, sep, true, true, true); }
- public ElementNode starfollow(final ElementNode e, final ElementNode sep) { return new RepeatNode(e, sep, true, true, false); }
- public ElementNode question(final ElementNode e) { return new RepeatNode(e, null, true, false, false); }
+ /** provides a label on the fields of a Seq */
+ private class LabelNode extends ElementNodeWrapper {
+ public final String label;
+ public LabelNode(String label, ElementNode e) { super(e); this.label = label; }
+ public String getFieldName() { return label; }
+ }
//////////////////////////////////////////////////////////////////////////////
public class Context {
public HashMap map = new HashMap();
public GrammarNode grammar;
- public Context(Tree t) { }
+ public Context() { }
public Context(GrammarNode g) { this.grammar = g; }
+ }
+
+
+ public class EmitContext extends Context {
+ public EmitContext(GrammarNode g) { super(g); }
+ }
+
+ public class BuildContext extends Context {
+ public BuildContext(Tree t) { }
+ public BuildContext(GrammarNode g) { super(g); }
public Union build() {
Union ret = null;
for(NonTerminalNode nt : grammar.values()) {
@@ -535,7 +706,7 @@ public class GrammarBuilder {
} else {
ret = new Union(name, false);
map.put(name, ret);
- nt.buildIntoPreallocatedUnion(this, nt, nt.drop(this), ret);
+ nt.getUnionNode().buildIntoPreallocatedUnion(this, nt, nt.isDropped(this), ret);
}
return ret;
}