checkpoint

[sbp.git] / src / edu / berkeley / sbp / meta / MetaGrammar.java

diff --git a/src/edu/berkeley/sbp/meta/MetaGrammar.java b/src/edu/berkeley/sbp/meta/MetaGrammar.java
index 78c654a..37edd7b 100644 (file)
--- a/src/edu/berkeley/sbp/meta/MetaGrammar.java
+++ b/src/edu/berkeley/sbp/meta/MetaGrammar.java
@@ -213,13 +213,13 @@ public class MetaGrammar {
 
     public static Union cached = null;
     public static Union make() { return make(MetaGrammarTree.meta, "s"); }
-    public static Union make(Tree t, String s) { return make(t, s, new AnnotationGrammarBindingResolver()); }
+    public static Union make(Tree t, String s) { return make(t, s, new AnnotationGrammarBindingResolver(MetaGrammarBindings.class)); }
     public static Union make(Tree t, String s, GrammarBindingResolver rm) {
         Tree.TreeFunctor<Object,Object> red = (Tree.TreeFunctor<Object,Object>)t.head();
-        MetaGrammarBindings.Grammar g = (MetaGrammarBindings.Grammar)red.invoke(t.children());
+        MetaGrammarBindings.GrammarNode g = (MetaGrammarBindings.GrammarNode)red.invoke(t.children());
         Context cx = new Context(g,rm);
         Union u = null;
-        for(MetaGrammarBindings.NonTerminal nt : g.values()) {
+        for(MetaGrammarBindings.NonTerminalNode nt : g.values()) {
             Union el = (Union)cx.get(nt.name);
             StringBuffer st = new StringBuffer();
             el.toString(st);
@@ -232,16 +232,16 @@ public class MetaGrammar {
 
     public static class Context {
         public HashMap<String,Union> map = new HashMap<String,Union>();
-        public MetaGrammarBindings.Grammar grammar;
+        public MetaGrammarBindings.GrammarNode grammar;
         public String cnt = null;
         public GrammarBindingResolver rm;
-        public Context(MetaGrammarBindings.Grammar g, GrammarBindingResolver rm) {
+        public Context(MetaGrammarBindings.GrammarNode g, GrammarBindingResolver rm) {
             this.grammar = g;
             this.rm = rm;
         }
         public Union build() {
             Union ret = null;
-            for(MetaGrammarBindings.NonTerminal nt : grammar.values()) {
+            for(MetaGrammarBindings.NonTerminalNode nt : grammar.values()) {
                 Union u = get(nt.name);
                 if ("s".equals(nt.name))
                     ret = u;
@@ -251,7 +251,7 @@ public class MetaGrammar {
         public Context(Tree t, GrammarBindingResolver rm) {
             this.rm = rm;
             Tree.TreeFunctor<Object,Object> red = (Tree.TreeFunctor<Object,Object>)t.head();
-            this.grammar = (MetaGrammarBindings.Grammar)red.invoke(t.children());
+            this.grammar = (MetaGrammarBindings.GrammarNode)red.invoke(t.children());
         }
         public Union peek(String name) { return map.get(name); }
         public void  put(String name, Union u) { map.put(name, u); }
@@ -260,7 +260,7 @@ public class MetaGrammar {
             if (ret != null) return ret;
             ret = new Union(name);
             map.put(name, ret);
-            MetaGrammarBindings.NonTerminal nt = grammar.get(name);
+            MetaGrammarBindings.NonTerminalNode nt = grammar.get(name);
             if (nt==null) {
                 System.err.println("*** warning could not find " + name);
             } else {