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

diff --git a/src/edu/berkeley/sbp/meta/MetaGrammarBindings.java b/src/edu/berkeley/sbp/meta/MetaGrammarBindings.java
index ca0a2eb..e3299cb 100644
--- a/src/edu/berkeley/sbp/meta/MetaGrammarBindings.java
+++ b/src/edu/berkeley/sbp/meta/MetaGrammarBindings.java
@@ -18,7 +18,7 @@ public class MetaGrammarBindings extends AnnotationGrammarBindings {
     public static String prefix = "";
     
     /** A grammar (a set of nonterminals) */
-    public static class GrammarNode extends HashMap<String,NonTerminalNode> implements NonTerminalSource {
+    public static class GrammarNode extends HashMap<String,NonTerminalNode> {
         public NonTerminalNode[] getNonTerminals() {
             return (NonTerminalNode[])values().toArray(new NonTerminalNode[0]);
         }
@@ -30,9 +30,7 @@ public class MetaGrammarBindings extends AnnotationGrammarBindings {
                 this.put(nt.name, nt);
             }
         }
-        public @bind.as("Grammar") GrammarNode(Object[] nt) {
-            add(nt);
-        }
+        public @bind.as("Grammar") GrammarNode(Object[] nt) { add(nt); }
         private void add(Object[] obs) {
             for(Object o : obs) {
                 if (o==null) continue;
@@ -43,7 +41,7 @@ public class MetaGrammarBindings extends AnnotationGrammarBindings {
                         throw new RuntimeException("duplicate definition of nonterminal \""+nt.name+"\"");
                     this.put(nt.name, nt);
                 }
-                else if (o instanceof NonTerminalSource) add(((NonTerminalSource)o).getNonTerminals());
+                else if (o instanceof GrammarNode) add(((GrammarNode)o).getNonTerminals());
             }
         }
         public String toString() {
@@ -91,8 +89,7 @@ public class MetaGrammarBindings extends AnnotationGrammarBindings {
         if (as==null) as = "";
         else if ("".equals(as)) { }
         else as = as +".";
-        
-        System.err.println("#import " + fileName + " as " + as);
+
         try {
             Tree t = new CharParser(MetaGrammar.newInstance()).parse(new FileInputStream("tests/"+fileName)).expand1();
             Tree.TreeFunctor<Object,Object> red = (Tree.TreeFunctor<Object,Object>)t.head();
@@ -107,22 +104,19 @@ public class MetaGrammarBindings extends AnnotationGrammarBindings {
         }
     }
 
-    public static interface NonTerminalSource {
-        public NonTerminalNode[] getNonTerminals();
-    }
-
-    public static class NonTerminalNode extends UnionNode implements NonTerminalSource {
+    public static class NonTerminalNode extends UnionNode {
         public boolean rep;
         public String  name = null;
         public String sep = null;
         public NonTerminalNode[] getNonTerminals() { return new NonTerminalNode[] { this }; }
-        public @bind.as("NonTerminal") NonTerminalNode(@bind.arg String name, @bind.arg Seq[][] sequences) { this(name, sequences, false); }
+        public @bind.as("NonTerminal") NonTerminalNode(@bind.arg String name, @bind.arg Seq[][] sequences) {
+            this(name, sequences, false); }
         public NonTerminalNode(String name, Seq[][] sequences, boolean rep) { this(name, sequences, rep, null); }
         public NonTerminalNode(String name, Seq[][] sequences, boolean rep, String sep) {
             this.name = prefix + name;
             this.sequences = sequences;
             this.rep = rep;
-            this.sep = prefix + sep;
+            this.sep = sep==null?null:(prefix + sep);
         }
         public Element build(Context cx, NonTerminalNode cnt) { return cx.get(name); }
         public void build(Context cx, Union u, NonTerminalNode cnt) {
@@ -131,7 +125,10 @@ public class MetaGrammarBindings extends AnnotationGrammarBindings {
 
             Union urep = new Union();
             urep.add(Sequence.empty);
-            urep.add(Sequence.singleton(new Element[] { cx.get(sep), u }, 1));
+            if (sep != null)
+                urep.add(Sequence.singleton(new Element[] { cx.get(sep), u }, 1));
+            else
+                urep.add(Sequence.singleton(new Element[] { u }, 0));
 
             for(int i=0; i<sequences.length; i++) {
                 Seq[] group = sequences[i];
@@ -240,7 +237,7 @@ public class MetaGrammarBindings extends AnnotationGrammarBindings {
             if (dropAll)     ret = Sequence.drop(els, false);
             else {
                 Production prod = new Production(tag, (cnt==null?null:cnt.name), els, drops);
-                ret = cx.rm.tryResolveTag(prod);
+                ret = cx.rm.createSequence(prod);
                 if (ret == null) {
                     int idx = -1;
                     for(int i=0; i<els.length; i++)
@@ -324,10 +321,10 @@ public class MetaGrammarBindings extends AnnotationGrammarBindings {
             this.e = e; this.sep = sep; this.zero = zero; this.many = many; this.max = max;}
         public Element build(Context cx, NonTerminalNode cnt) {
             return (!max)
-                ? Sequence.repeat(e.build(cx, null),        zero, many, sep==null ? null : sep.build(cx, null), 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, null)), zero, many,                                   cx.rm.repeatTag())
-                : Sequence.repeatMaximal(e.build(cx, null),                    zero, many, infer(sep.build(cx, null)), 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());
         }
     }
 
@@ -355,9 +352,10 @@ public class MetaGrammarBindings extends AnnotationGrammarBindings {
 
     public static @bind.as("^")   ElementNode caret(final String s) {
         final String thePrefix = prefix;
-        return new Drop(new Constant(CharRange.string(s)) {
+        return new Constant(CharRange.string(s)) {
                 public String getOwnerTag() { return thePrefix+s; }
-            });
+                public boolean drop() { return true; }
+            };
     }
 
     public static @bind.as("~")   ElementNode tilde(final ElementNode e) {
@@ -408,7 +406,6 @@ public class MetaGrammarBindings extends AnnotationGrammarBindings {
             map.put(name, ret);
             NonTerminalNode nt = grammar.get(name);
             if (nt==null) {
-                //System.err.println("*** warning could not find " + name);
                 throw new Error("warning could not find " + name);
             } else {
                 String old = cnt;
@@ -421,39 +418,43 @@ public class MetaGrammarBindings extends AnnotationGrammarBindings {
 
     }
 
+    public static abstract class ElementNode {
+        public String getLabel() { return null; }
+        public String getOwnerTag() { return null; }
+        public boolean drop() { return false; }
+        public abstract Element build(Context cx, NonTerminalNode cnt);
+    }
+
+    public static abstract class ElementNodeWrapper extends ElementNode {
+        protected ElementNode _e;
+        public ElementNodeWrapper(ElementNode e) { this._e = e; }
+        public String getLabel() { return _e.getLabel(); }
+        public String getOwnerTag() { return _e.getOwnerTag(); }
+        public boolean drop() { return _e.drop(); }
+        public Element build(Context cx, NonTerminalNode cnt) { return _e.build(cx, cnt); }
+    }
+
     public static class Constant extends ElementNode {
         Element constant;
         public Constant(Element constant) { this.constant = constant; }
         public Element build(Context cx, NonTerminalNode cnt) { return constant; }
     }
-    public abstract static class PostProcess extends ElementNode {
+
+    public abstract static class PostProcess extends ElementNodeWrapper {
         ElementNode e;
-        public PostProcess(ElementNode e) { this.e = e; }
-        public Element build(Context cx, NonTerminalNode cnt) { return postProcess(e.build(cx, cnt)); }
+        public PostProcess(ElementNode e) { super(e); }
+        public Element build(Context cx, NonTerminalNode cnt) { return postProcess(_e.build(cx, cnt)); }
         public abstract Element postProcess(Element e);
     }
-    public static abstract class ElementNode {
-        public String getLabel() { return null; }
-        public String getOwnerTag() { return null; }
-        public boolean drop() { return false; }
-        public abstract Element build(Context cx, NonTerminalNode cnt);
-    }
 
-    public static class Drop extends ElementNode {
-        public ElementNode e;
-        public Drop(ElementNode e) { this.e = e; }
-        public String getLabel() { return null; }
+    public static class Drop extends ElementNodeWrapper {
+        public Drop(ElementNode e) { super(e); }
         public boolean drop() { return true; }
-        public String getOwnerTag() { return e.getOwnerTag(); }
-        public Element build(Context cx, NonTerminalNode cnt) { return e.build(cx, cnt); }
     }
 
-    public static class Label extends ElementNode {
+    public static class Label extends ElementNodeWrapper {
         public String label;
-        public ElementNode e;
-        public Label(String label, ElementNode e) { this.e = e; this.label = label; }
+        public Label(String label, ElementNode e) { super(e); this.label = label; }
         public String getLabel() { return label; }
-        public String getOwnerTag() { return e.getOwnerTag(); }
-        public Element build(Context cx, NonTerminalNode cnt) { return e.build(cx, cnt); }
     }
 }