X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2Fmeta%2FMetaGrammarBindings.java;h=d33758c87374e7bb3818ff0e8fff7b2384fb869c;hp=dc35dfc3180c5ecf84e1ffaee147a4652d8784a9;hb=f3b4ef0d81d572694905f4fe284cac6311a29ea4;hpb=babae49de7b777a5847f277bb74c88e77c67568a

diff --git a/src/edu/berkeley/sbp/meta/MetaGrammarBindings.java b/src/edu/berkeley/sbp/meta/MetaGrammarBindings.java
index dc35dfc..d33758c 100644
--- a/src/edu/berkeley/sbp/meta/MetaGrammarBindings.java
+++ b/src/edu/berkeley/sbp/meta/MetaGrammarBindings.java
@@ -15,7 +15,13 @@ public class MetaGrammarBindings {
     /** A grammar (a set of nonterminals) */
     public static class GrammarNode extends HashMap<String,NonTerminalNode> {
         public @bind.as("Grammar") GrammarNode(NonTerminalNode[] nonterminals) {
-            for(NonTerminalNode nt : nonterminals) this.put(nt.name, nt); }
+            for(NonTerminalNode nt : nonterminals) {
+                if (nt==null) continue;
+                if (this.get(nt.name)!=null)
+                    throw new RuntimeException("duplicate definition of nonterminal \""+nt.name+"\"");
+                this.put(nt.name, nt);
+            }
+        }
         public String toString() {
             String ret = "[ ";
             for(NonTerminalNode nt : values()) ret += nt + ", ";
@@ -36,14 +42,14 @@ public class MetaGrammarBindings {
 
     public abstract static class UnionNode extends ElementNode {
         public Seq[][] sequences;
-        public void build(Context cx, Union u) {
+        public void build(Context cx, Union u, NonTerminalNode cnt) {
             HashSet<Sequence> bad2 = new HashSet<Sequence>();
             for(int i=0; i<sequences.length; i++) {
                 Seq[] group = sequences[i];
                 Union u2 = new Union();
                 if (sequences.length==1) u2 = u;
                 for(int j=0; j<group.length; j++) {
-                    group[j].build(cx, u2, false);
+                    group[j].build(cx, u2, false, cnt);
                 }
                 if (sequences.length==1) break;
                 Sequence seq = Sequence.singleton(u2);
@@ -57,6 +63,11 @@ public class MetaGrammarBindings {
         }
     }
 
+    public static @bind.as("#import") NonTerminalNode poundimport(String fileName) {
+        System.err.println("#import " + fileName);
+        return null;
+    }
+
     public static class NonTerminalNode extends UnionNode {
         public boolean rep;
         public String  name = null;
@@ -69,9 +80,9 @@ public class MetaGrammarBindings {
             this.rep = rep;
             this.sep = sep;
         }
-        public Element build(Context cx) { return cx.get(name); }
-        public void build(Context cx, Union u) {
-            if (!rep) { super.build(cx, u); return; }
+        public Element build(Context cx, NonTerminalNode cnt) { return cx.get(name); }
+        public void build(Context cx, Union u, NonTerminalNode cnt) {
+            if (!rep) { super.build(cx, u, this); return; }
             HashSet<Sequence> bad2 = new HashSet<Sequence>();
 
             Union urep = new Union();
@@ -84,7 +95,7 @@ public class MetaGrammarBindings {
                 if (sequences.length==1) u2 = u;
                 for(int j=0; j<group.length; j++) {
                     Union u3 = new Union();
-                    group[j].build(cx, u3, false);
+                    group[j].build(cx, u3, false, this);
                     Sequence s = Sequence.unwrap(new Element[] { u3, urep },
                                                  cx.rm.repeatTag(),
                                                  new boolean[] { false, false });
@@ -110,9 +121,9 @@ public class MetaGrammarBindings {
         public @bind.as("(") AnonUnionNode(Seq[][] sequences) {
             this.sequences = sequences;
         }
-        public Element build(Context cx) {
+        public Element build(Context cx, NonTerminalNode cnt) {
             Union ret = new Union();
-            build(cx, ret);
+            build(cx, ret, cnt);
             return ret;
         }
     }
@@ -128,7 +139,7 @@ public class MetaGrammarBindings {
         public String getLabel() { return null; }
         public String getOwnerTag() { return null; }
         public boolean drop() { return false; }
-        public abstract Element build(Context cx);
+        public abstract Element build(Context cx, NonTerminalNode cnt);
     }
 
     public static class Drop extends ElementNode {
@@ -137,7 +148,7 @@ public class MetaGrammarBindings {
         public String getLabel() { return null; }
         public boolean drop() { return true; }
         public String getOwnerTag() { return e.getOwnerTag(); }
-        public Element build(Context cx) { return e.build(cx); }
+        public Element build(Context cx, NonTerminalNode cnt) { return e.build(cx, cnt); }
     }
 
     public static class Label extends ElementNode {
@@ -146,7 +157,7 @@ public class MetaGrammarBindings {
         public Label(String label, ElementNode e) { this.e = e; this.label = label; }
         public String getLabel() { return label; }
         public String getOwnerTag() { return e.getOwnerTag(); }
-        public Element build(Context cx) { return e.build(cx); }
+        public Element build(Context cx, NonTerminalNode cnt) { return e.build(cx, cnt); }
     }
 
     public static /*abstract*/ class Seq {
@@ -186,31 +197,29 @@ public class MetaGrammarBindings {
             this.elements = elements;
             return this;
         }
-        public Sequence build(Context cx, Union u, boolean lame) {
-            Sequence ret = build0(cx, lame || this.lame);
-            for(Seq s : and) { Sequence dork = s.build(cx, u, true); ret = ret.and(dork); }
-            for(Seq s : not) { Sequence dork = s.build(cx, u, true); ret = ret.not(dork); }
+        public Sequence build(Context cx, Union u, boolean lame, NonTerminalNode cnt) {
+            Sequence ret = build0(cx, lame || this.lame, cnt);
+            for(Seq s : and) { Sequence dork = s.build(cx, u, true, cnt); ret = ret.and(dork); }
+            for(Seq s : not) { Sequence dork = s.build(cx, u, true, cnt); ret = ret.not(dork); }
             u.add(ret);
             ret.lame = lame;
             return ret;
         }
-        public Sequence build0(Context cx, boolean lame) {
+        public Sequence build0(Context cx, boolean lame, NonTerminalNode cnt) {
             boolean dropAll = lame;
             if (tag!=null && "()".equals(tag)) dropAll = true;
-            Object[] labels = new Object[elements.length];
             boolean[] drops = new boolean[elements.length];
             Element[] els = new Element[elements.length];
             for(int i=0; i<elements.length; i++) {
-                labels[i] = elements[i].getLabel();
                 drops[i]  = elements[i].drop();
-                els[i] = elements[i].build(cx);
+                els[i] = elements[i].build(cx, cnt);
                 if (elements[i].getOwnerTag() != null)
                     tag = elements[i].getOwnerTag();
             }
             Sequence ret = null;
             if (dropAll)     ret = Sequence.drop(els, false);
             else {
-                ret = cx.rm.tryResolveTag(tag, cx.cnt, els, labels, drops);
+                ret = cx.rm.tryResolveTag(tag, cnt==null?null:cnt.name, els, drops);
                 if (ret == null) {
                     int idx = -1;
                     for(int i=0; i<els.length; i++)
@@ -222,7 +231,7 @@ public class MetaGrammarBindings {
                 }
             }
             if (this.follow != null)
-                ret.follow = infer(this.follow.build(cx));
+                ret.follow = infer(this.follow.build(cx, null));
             ret.lame = this.lame;
             return ret;
         }
@@ -242,7 +251,11 @@ public class MetaGrammarBindings {
 
     public static @bind.as("NonTerminalReference") class NonTerminalReferenceNode extends ElementNode {
         public @bind.arg String nonTerminal;
-        public Element build(Context cx) { return cx.get(nonTerminal); }
+        public Element build(Context cx, NonTerminalNode cnt) {
+            Element ret = cx.get(nonTerminal);
+            if (ret == null) throw new RuntimeException("unkown nonterminal \""+nonTerminal+"\"");
+            return ret;
+        }
     }
 
     public static class Literal extends Constant {
@@ -253,7 +266,7 @@ public class MetaGrammarBindings {
     public static                     class CharClass            extends ElementNode {
         Range[] ranges;
         public @bind.as("[") CharClass(Range[] ranges) { this.ranges = ranges; }
-        public Element build(Context cx) {
+        public Element build(Context cx, NonTerminalNode cnt) {
             edu.berkeley.sbp.util.Range.Set set = new edu.berkeley.sbp.util.Range.Set();
             for(Range r : ranges)
                 set.add(r.first, r.last);
@@ -263,9 +276,9 @@ public class MetaGrammarBindings {
 
     public static @bind.as("{")           class XTree                 extends ElementNode {
         public @bind.arg Seq body;
-        public Element build(Context cx) {
+        public Element build(Context cx, NonTerminalNode cnt) {
             Union u = new Union();
-            Sequence s = body.build(cx, u, false);
+            Sequence s = body.build(cx, u, false, null);
             Union u2 = new Union();
             u2.add(Sequence.singleton(new Element[] {
                 CharRange.leftBrace,
@@ -283,23 +296,23 @@ public class MetaGrammarBindings {
         public boolean zero, many, max;
         public Rep(ElementNode e, ElementNode sep, boolean zero, boolean many, boolean max) {
             this.e = e; this.sep = sep; this.zero = zero; this.many = many; this.max = max;}
-        public Element build(Context cx) {
+        public Element build(Context cx, NonTerminalNode cnt) {
             return (!max)
-                ? Sequence.repeat(e.build(cx),        zero, many, sep==null ? null : sep.build(cx), cx.rm.repeatTag())
+                ? Sequence.repeat(e.build(cx, null),        zero, many, sep==null ? null : sep.build(cx, null), cx.rm.repeatTag())
                 : sep==null
-                ? Sequence.repeatMaximal(infer(e.build(cx)), zero, many,                                   cx.rm.repeatTag())
-                : Sequence.repeatMaximal(e.build(cx),                    zero, many, infer(sep.build(cx)), cx.rm.repeatTag());
+                ? Sequence.repeatMaximal(infer(e.build(cx, null)), zero, many,                                   cx.rm.repeatTag())
+                : Sequence.repeatMaximal(e.build(cx, null),                    zero, many, infer(sep.build(cx, null)), cx.rm.repeatTag());
         }
     }
     public static class Constant extends ElementNode {
         Element constant;
         public Constant(Element constant) { this.constant = constant; }
-        public Element build(Context cx) { return constant; }
+        public Element build(Context cx, NonTerminalNode cnt) { return constant; }
     }
     public abstract static class PostProcess extends ElementNode {
         ElementNode e;
         public PostProcess(ElementNode e) { this.e = e; }
-        public Element build(Context cx) { return postProcess(e.build(cx)); }
+        public Element build(Context cx, NonTerminalNode cnt) { return postProcess(e.build(cx, cnt)); }
         public abstract Element postProcess(Element e);
     }
 
@@ -325,7 +338,7 @@ public class MetaGrammarBindings {
     public static @bind.as("~")   ElementNode tilde(final ElementNode e) {
         return new PostProcess(e) {
                 public Element postProcess(Element e) {
-                    return infer((Topology<Character>)Atom.toAtom(e).complement()); 
+                    return infer((Topology<Character>)Atom.toAtom(e).complement().minus(CharRange.braces));
                 } }; }
 
     public static @bind.as("Word")        String word(String s) { return s; }
@@ -359,7 +372,7 @@ public class MetaGrammarBindings {
         public Context(Tree t, GrammarBindingResolver rm) {
             this.rm = rm;
             Tree.TreeFunctor<Object,Object> red = (Tree.TreeFunctor<Object,Object>)t.head();
-            this.grammar = (GrammarNode)red.invoke(t.children());
+            this.grammar = (GrammarNode)red.invoke(t);
         }
         public Union peek(String name) { return map.get(name); }
         public void  put(String name, Union u) { map.put(name, u); }
@@ -374,7 +387,7 @@ public class MetaGrammarBindings {
             } else {
                 String old = cnt;
                 cnt = name;
-                nt.build(this, ret);
+                nt.build(this, ret, nt);
                 cnt = old;
             }
             return ret;