X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2Fmeta%2FGrammarAST.java;h=05c7b39dc7394dac4cc448b59f5a6dbc70f76422;hp=997d0b6230b1f06fc05ec4fd5742c86aaa3aef10;hb=013262fd96a3dfc4c2cd7a0ba320dd7981ce678c;hpb=61a0c83fd40b98292b2dfe1eaba237eb804b2cb4

diff --git a/src/edu/berkeley/sbp/meta/GrammarAST.java b/src/edu/berkeley/sbp/meta/GrammarAST.java
index 997d0b6..05c7b39 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.*;
@@ -17,6 +17,14 @@ import java.io.*;
 public class GrammarAST {
 
     /**
+     *  Returns a Union representing the metagrammar (<tt>meta.g</tt>); the Tree produced by
+     *  parsing with this Union should be provided to <tt>buildFromAST</tt>
+     */
+    public static Union getMetaGrammar() {
+        return MetaGrammar.newInstance();
+    }
+
+    /**
      *  Create a grammar from a parse tree and binding resolver
      * 
      *  @param t   a tree produced by parsing a grammar using the metagrammar
@@ -27,7 +35,9 @@ public class GrammarAST {
         return new GrammarAST(includes, "").buildGrammar(grammarAST, startingNonterminal);
     }
 
-    public static Object illegalTag = ""; // this is the tag that should never appear in the non-dropped output FIXME
+    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;
@@ -40,19 +50,18 @@ public class GrammarAST {
     // 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<ret.length; i++) {
+        for(int i=0; i<ret.length; i++)
             ret[i] = walk(t.child(i));
-            if (ret[i] instanceof Object[])
-                ret[i] = Reflection.lub((Object[])ret[i]);
-        }
         return Reflection.lub(ret);
     }
-    public String stringifyChildren(Tree t) {
+    private static String stringifyChildren(Tree t) {
         StringBuffer sb = new StringBuffer();
         for(int i=0; i<t.size(); i++) {
             sb.append(t.child(i).head());
@@ -60,14 +69,17 @@ public class GrammarAST {
         }
         return sb.toString();
     }
-    public String unescape(Tree t) {
+    private static String unescape(Tree t) {
         StringBuffer sb = new StringBuffer();
         for(int i=0; i<t.size(); i++)
             sb.append(t.child(i).head()+stringifyChildren(t.child(i)));
         return sb.toString();
     }
 
-    public Object walk(Tree t) {
+    private ElementNode walkElement(Tree t) { return (ElementNode)walk(t); }
+    private String      walkString(Tree t) { return (String)walk(t); }
+    private Seq         walkSeq(Tree t) { return (Seq)walk(t); }
+    private Object walk(Tree t) {
         String head = (String)t.head();
         while(head.indexOf('.') > 0)
             head = head.substring(head.indexOf('.')+1);
@@ -77,36 +89,33 @@ public class GrammarAST {
         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 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 walkElement(t.child(0)).lifted();
         if (head.equals("Quoted")) return stringifyChildren(t);
         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);
         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);
-        if (head.equals("&"))   return and2(walkSeq(t.child(0)), walkSeq(t.child(1)));
-        if (head.equals("&~"))  return andnot2(walkSeq(t.child(0)), walkSeq(t.child(1)));
+        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));
@@ -116,45 +125,37 @@ public class GrammarAST {
         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") && t.size()==2 && ">".equals(t.child(0).head()))
-            return new char[] { CharAtom.left, CharAtom.left };
-        if (head.equals("Range") && t.size()==2 && "<".equals(t.child(0).head()))
-            return new char[] { CharAtom.right, CharAtom.right };
-        if (head.equals("Range") && t.size()==1) return new char[] { unescape(t).charAt(0), unescape(t).charAt(0) };
-        if (head.equals("Range")) return new char[] { unescape(t).charAt(0), unescape(t).charAt(1) };
+        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("\r"))   return "\r";
+        if (head.equals("SubGrammar")) return GrammarAST.buildFromAST(t.child(0), "s", includes);
         if (head.equals("NonTerminal"))
-            return new NonTerminalNode((String)walk(t.child(0)),
+            return new NonTerminalNode(walkString(t.child(0)),
                                        (Seq[][])walkChildren(t.child(1)), false, null, 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<seq.length; i++)
-                    seq[i] = tag(tag, seq[i]);
+                    seq[i] = seq[i].tag(tag);
             return new NonTerminalNode(tag, seqs, false, null, false);
         }
-        if (head.equals("TestCase"))
-            return new RegressionTests.TestCase(walkString(t.child(0)),
-                                                walkString(t.child(1)),
-                                                (String[])Reflection.coerce(walkChildren(t.child(2)), String[].class),
-                                                (Union)walk(t.child(3)),
-                                                false,
-                                                false);
         if (head.equals("#import")) {
             String fileName = (String)stringifyChildren(t.child(0));
             for(File f : includes) {
                 File file = new File(f.getAbsolutePath()+File.separatorChar+fileName);
                 if (!file.exists()) continue;
                 try {
-                    String newPrefix = t.size()<2 ? "" : ((String)walk(t.child(1))+".");
+                    String newPrefix = t.size()<2 ? "" : (walkString(t.child(1))+".");
                     FileInputStream fis = new FileInputStream(file);
                     Tree tr = new CharParser(MetaGrammar.newInstance()).parse(fis).expand1();
-                    return (GrammarNode)new GrammarBuilder(includes, newPrefix).walk(tr);
+                    return (GrammarNode)new GrammarAST(includes, newPrefix).walk(tr);
                 } catch (Exception e) {
                     throw new RuntimeException("while parsing " + file, e);
                 }
@@ -163,6 +164,7 @@ public class GrammarAST {
         }
         throw new RuntimeException("unknown head: \"" + head + "\" => " + (head.equals("...")));
     }
+
     
     // Nodes //////////////////////////////////////////////////////////////////////////////
 
@@ -198,23 +200,40 @@ public class GrammarAST {
         public Union build(String rootNonterminal) {
             Context cx = new Context(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 {
+    private abstract class ElementNode {
+        public boolean lifted = false;
+        public Seq ownerSeq = null;
+        public ElementNode lifted() { this.lifted = true; return this; }
+        public boolean drop(Context cx) { return false; }
+        public Atom toAtom(Context cx) { throw new Error("can't convert a " + this.getClass().getName() + " to an atom: " + this); }
+        public abstract Element build(Context cx, NonTerminalNode cnt, boolean dropall);
+    }
+
+    private class UnionNode extends ElementNode {
         public Seq[][] sequences;
         public String  sep = null;
         public boolean rep;
+        public UnionNode(Seq seq) { this(new Seq[][] { new Seq[] { seq } }); }
         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 boolean drop(Context cx) {
+            for(Seq[] seqs : sequences)
+                for(Seq seq : seqs)
+                    if (!seq.drop(cx))
+                        return false;
+            return true;
+        }
         public Atom toAtom(Context cx) {
             Atom ret = null;
             for(Seq[] ss : sequences)
@@ -228,7 +247,7 @@ public class GrammarAST {
             Union urep = null;
             if (rep) {
                 urep = new Union(null, false);
-                urep.add(Sequence.create(new Element[0], cnt.name));
+                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));
@@ -247,7 +266,7 @@ public class GrammarAST {
                         Sequence s = Sequence.create(cnt.name,
                                                      new Element[] { u3, urep },
                                                      new boolean[] { false, false },
-                                                     true);
+                                                     new boolean[] { false, true});
                         u2.add(s);
                     }
                 if (sequences.length==1) break;
@@ -260,7 +279,7 @@ public class GrammarAST {
         }
     }
 
-    public class NonTerminalNode extends UnionNode {
+    private class NonTerminalNode extends UnionNode {
         public boolean alwaysDrop;
         public String  name = null;
         public boolean drop(Context cx) { return alwaysDrop; }
@@ -272,20 +291,49 @@ public class GrammarAST {
         public Element build(Context cx, NonTerminalNode cnt, boolean dropall) { return cx.get(name); }
     }
 
-    public class Seq {
+    private class Seq {
         public boolean alwaysDrop = false;
-        public boolean drop(Context cx) { return alwaysDrop; }
+        public boolean drop(Context cx) {
+            if (alwaysDrop) return true;
+            if (tag!=null) return false;
+            for(int i=0; i<elements.length; i++)
+                if (!elements[i].drop(cx))
+                    return false;
+            return true;
+        }
         HashSet<Seq> and = new HashSet<Seq>();
         HashSet<Seq> not = new HashSet<Seq>();
         ElementNode[] elements;
         ElementNode follow;
         String tag = null;
         public Seq(ElementNode e) { this(new ElementNode[] { e }); }
-        public Seq(ElementNode[] elements) {
-            this.elements = elements;
-            for(int i=0; i<elements.length; i++)
+        public Seq(ElementNode[] elements) { this(elements, true); }
+        public Seq(ElementNode[] el, boolean check) {
+            this.elements = new ElementNode[el.length];
+            System.arraycopy(el, 0, elements, 0, el.length);
+            for(int i=0; i<elements.length; i++) {
                 if (elements[i]==null)
                     throw new RuntimeException();
+                elements[i].ownerSeq = this;
+            }
+            // FIXME: this whole mechanism is sketchy
+            if (check)
+                for(int i=0; i<elements.length; i++) {
+                    if ((elements[i] instanceof ReferenceNode) && ((ReferenceNode)elements[i]).parenthesized) {
+                        ReferenceNode rn = (ReferenceNode)elements[i];
+                        ElementNode replace = null;
+                        for(int j=0; j<elements.length; j++) {
+                            if (!(elements[j] instanceof ReferenceNode)) continue;
+                            ReferenceNode rn2 = (ReferenceNode)elements[j];
+                            if (rn2.nonTerminal.equals(rn.nonTerminal) && !rn2.parenthesized) {
+                                if (replace == null) {
+                                    replace = new UnionNode(new Seq(rn2).andnot(new Seq(elements, false)));
+                                }
+                                elements[j] = replace;
+                            }
+                        }
+                    }
+                }
         }
         public Atom toAtom(Context cx) {
             if (elements.length != 1)
@@ -295,16 +343,8 @@ public class GrammarAST {
         }
         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<this.elements.length; i++) {
@@ -329,8 +369,10 @@ public class GrammarAST {
             for(int i=0; i<elements.length; i++) {
                 if (dropall) drops[i] = true;
                 else         drops[i] = elements[i].drop(cx);
-                if (elements[i].getOwnerTag() != null)
-                    tag = elements[i].getOwnerTag();
+                if (elements[i] instanceof LiteralNode && ((LiteralNode)elements[i]).caret) {
+                    if (tag != null) throw new RuntimeException("cannot have multiple tags in a sequence: " + this);
+                    tag = ((LiteralNode)elements[i]).getLiteralTag();
+                }
             }
             Sequence ret = null;
             int idx = -1;
@@ -347,46 +389,54 @@ public class GrammarAST {
                     els[i] = elements[i].build(cx, cnt, dropall);
             }
             if (tag==null && multiNonDrop)
-                throw new RuntimeException("multiple non-dropped elements in sequence: " + Sequence.create(els, ""));
-            boolean lift = false;
-            if (elements.length > 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<elements.length; i++)
+                lifts[i] = elements[i].lifted;
             if (!multiNonDrop) {
                 if (idx == -1) 
                     ret = tag==null
-                        ? Sequence.create(els, illegalTag)
-                        : Sequence.createLeft(tag, els, drops, lift);
+                        ? Sequence.create(illegalTag, els)
+                        : Sequence.create(tag, els, drops, lifts);
                 else if (tag==null) ret = Sequence.create(els, idx);
-                else ret = Sequence.createLeft(tag, els, drops, lift);
+                else ret = Sequence.create(tag, els, drops, lifts);
             }
             if (multiNonDrop)
-                ret = Sequence.createLeft(tag, els, drops, lift);
+                ret = Sequence.create(tag, els, drops, lifts);
             if (this.follow != null)
                 ret = ret.followedBy(this.follow.toAtom(cx));
             return ret;
         }
     }
 
-    public class ReferenceNode extends ElementNode {
+    private class ReferenceNode extends ElementNode {
         public String nonTerminal;
+        public boolean parenthesized;
         public ReferenceNode() { }
+        public ReferenceNode(String nonTerminal) { this(nonTerminal, false); }
+        public ReferenceNode(String nonTerminal, boolean parenthesized) {
+            this.nonTerminal = nonTerminal.indexOf('.')==-1 ? (prefix + nonTerminal) : nonTerminal;
+            this.parenthesized = parenthesized;
+        }
         public NonTerminalNode resolve(Context cx) {
             NonTerminalNode ret = cx.grammar.get(nonTerminal);
             if (ret==null) throw new RuntimeException("undefined nonterminal: " + nonTerminal);
             return ret;
         }
-        public ReferenceNode(String nonTerminal) { this.nonTerminal = prefix + nonTerminal; }
-        public Atom toAtom(Context cx) { return cx.grammar.get(nonTerminal).toAtom(cx); }
+        public Atom toAtom(Context cx) {
+            ElementNode ret = cx.grammar.get(nonTerminal);
+            if (ret == null) throw new RuntimeException("unknown nonterminal \""+nonTerminal+"\"");
+            return ret.toAtom(cx);
+        }
         public boolean drop(Context cx) { return resolve(cx).drop(cx); }
         public Element build(Context cx, NonTerminalNode cnt, boolean dropall) {
-            if (!this.nonTerminal.startsWith(prefix)) nonTerminal = prefix + nonTerminal;
             Element ret = cx.get(nonTerminal);
             if (ret == null) throw new RuntimeException("unknown nonterminal \""+nonTerminal+"\"");
             return ret;
         }
     }
 
-    public class LiteralNode extends ElementNode {
+    private class LiteralNode extends ElementNode {
         private String string;
         private final String thePrefix = prefix;
         private boolean caret;
@@ -395,38 +445,32 @@ public class GrammarAST {
             this.string = string;
             this.caret = caret;
         }
-        public String getOwnerTag() { return caret ? thePrefix+string : super.getOwnerTag(); }
+        public String getLiteralTag() { return caret ? thePrefix+string : null; }
         public String toString() { return "\""+string+"\""; }
         public boolean drop(Context cx) { return true; }
         public Atom toAtom(Context cx) {
             if (string.length()!=1) return super.toAtom(cx);
-            edu.berkeley.sbp.util.Range.Set set = new edu.berkeley.sbp.util.Range.Set();
+            Range.Set set = new Range.Set();
             set.add(string.charAt(0), string.charAt(0));
             return CharAtom.set(set);
         }
         public Element build(Context cx, NonTerminalNode cnt, boolean dropall) { return CharAtom.string(string); }
     }
 
-    public class AtomNode extends ElementNode {
-        AtomNodeRange[] ranges;
-        public AtomNode() { this(new AtomNodeRange[0]); }
-        public AtomNode(AtomNodeRange[] ranges) { this.ranges = ranges; }
-        public AtomNode(AtomNodeRange range) { this.ranges = new AtomNodeRange[] { range }; }
+    private class AtomNode extends ElementNode {
+        char[][] ranges;
+        public AtomNode() { this(new char[0][]); }
+        public AtomNode(char[][] ranges) { this.ranges = ranges; }
+        public AtomNode(char[] range) { this.ranges = new char[][] { range }; }
         public Element build(Context cx, NonTerminalNode cnt, boolean dropall) { return toAtom(cx); }
         public Atom toAtom(Context cx) {
-            edu.berkeley.sbp.util.Range.Set set = new edu.berkeley.sbp.util.Range.Set();
-            for(AtomNodeRange r : ranges) set.add(r.first, r.last);
+            Range.Set set = new Range.Set();
+            for(char[] r : ranges) set.add(r[0], r[1]);
             return CharAtom.set(set);
         }
     }
-    public class AtomNodeRange {
-        public char first;
-        public char last;
-        public AtomNodeRange(char only) { first = only; last = only; }
-        public AtomNodeRange(char first, char last) { this.first = first; this.last = last; }
-    }
 
-    public class RepeatNode extends ElementNode {
+    private class RepeatNode extends ElementNode {
         public ElementNode e, sep;
         public final boolean zero, many, max;
         public RepeatNode(ElementNode e, ElementNode sep, boolean zero, boolean many, boolean max) {
@@ -452,50 +496,25 @@ public class GrammarAST {
         }
     }
 
-    public abstract class ElementNode {
-        public boolean lifted = false;
-        public String getOwnerTag() { return null; }
-        public boolean drop(Context cx) { return false; }
-        public Atom toAtom(Context cx) { throw new Error("can't convert a " + this.getClass().getName() + " to an atom: " + this); }
-        public abstract Element build(Context cx, NonTerminalNode cnt, boolean dropall);
-    }
-
-    public abstract class ElementNodeWrapper extends ElementNode {
+    private abstract class ElementNodeWrapper extends ElementNode {
         protected ElementNode _e;
         public ElementNodeWrapper(ElementNode e) { this._e = e; }
-        public String getOwnerTag() { return _e.getOwnerTag(); }
         public boolean drop(Context cx) { return _e.drop(cx); }
         public Atom toAtom(Context cx) { return _e.toAtom(cx); }
         public Element build(Context cx, NonTerminalNode cnt, boolean dropall) { return _e.build(cx, cnt, dropall); }
     }
 
-    public class TildeNode extends ElementNodeWrapper {
+    private class TildeNode extends ElementNodeWrapper {
         public TildeNode(ElementNode e) { super(e); }
         public Atom toAtom(Context cx) { return (Atom)((Topology<Character>)_e.toAtom(cx).complement()); }
         public Element build(Context 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    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); }
-
     //////////////////////////////////////////////////////////////////////////////
 
     public class Context {