X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2Fmeta%2FMetaGrammar.java;h=78c654a66ec0751fee256ce97ec82d448beb6a8e;hp=aa02d5f475633c88e3eb6450b067d936b0789f6e;hb=59eead6bf0f2d9a7abeba03f3fdab04625521faf;hpb=92fb8d7453b3caad1471d84dd452f5ec07785e5e

diff --git a/src/edu/berkeley/sbp/meta/MetaGrammar.java b/src/edu/berkeley/sbp/meta/MetaGrammar.java
index aa02d5f..78c654a 100644
--- a/src/edu/berkeley/sbp/meta/MetaGrammar.java
+++ b/src/edu/berkeley/sbp/meta/MetaGrammar.java
@@ -16,9 +16,6 @@ public class MetaGrammar {
             System.err.println("usage: java " + MetaGrammar.class.getName() + " grammarfile.g com.yourdomain.package.ClassName");
             System.exit(-1);
         }
-        //StringBuffer sbs = new StringBuffer();
-        //((MetaGrammar)new MetaGrammar().walk(meta)).nt.get("e").toString(sbs);
-        //System.err.println(sbs);
         String className   = args[1].substring(args[1].lastIndexOf('.')+1);
         String packageName = args[1].substring(0, args[1].lastIndexOf('.'));
         String fileName    = packageName.replace('.', '/') + "/" + className + ".java";
@@ -35,15 +32,6 @@ public class MetaGrammar {
 
         out.append("\n        // DO NOT EDIT STUFF BELOW: IT IS AUTOMATICALLY GENERATED\n");
 
-        /*
-        GrammarCompiler m = new GrammarCompiler();
-        Tree<String> res = new CharParser(MetaGrammar.make()).parse(new FileInputStream(args[0])).expand1();
-        MetaGrammar.Meta.MetaGrammarFile mgf = m.new MetaGrammarFile(res);
-        MetaGrammar.BuildContext bc = new MetaGrammar.BuildContext(mgf);
-
-        Union meta = mgf.get("s").build(bc);
-        Tree t = new CharParser(meta).parse(new FileInputStream(args[0])).expand1();
-        */
         Tree t = MetaGrammarTree.meta;
         Union u = MetaGrammar.make(t, "s");
 
@@ -51,14 +39,6 @@ public class MetaGrammar {
         System.err.println("== parsing with parsed grammar =================================================================================");
         t = new CharParser((Union)u).parse(new FileInputStream(args[0])).expand1();
         System.out.println(t.toPrettyString());
-        //Forest<String> fs = new CharParser(make()).parse(new FileInputStream(args[0]));
-        //System.out.println(fs.expand1());
-
-        //GraphViz gv = new GraphViz();
-        //fs.toGraphViz(gv);
-        //FileOutputStream fox = new FileOutputStream("out.dot");
-        //gv.dump(fox);
-        //fox.close();
 
         t.toJava(out);
         out.append("\n        // DO NOT EDIT STUFF ABOVE: IT IS AUTOMATICALLY GENERATED\n");
@@ -121,22 +101,24 @@ public class MetaGrammar {
 
         public boolean isCompatible(Production p) {
             bind.as t = getBindAs();
+            bind b = getBind();
+
             if (t != null &&
-                (t.value().equals(p.tag) ||
-                 (t.value().equals("") && getName().equals(p.tag))))
+                (t.value().equals(p.tag)))
                 return buildSequence(p)!=null;
 
-            bind b = getBind();
-            System.out.println(_bindable.getClass().getSimpleName() + ": " + _bindable.getSimpleName());
+            if (t != null &&
+                ((t.value().equals("") && getName().equals(p.tag))))
+                return buildSequence(p)!=null;
             if (b != null && getName().equals(p.tag))
                 return buildSequence(p)!=null;
 
-            bind.as n = getBindAs();
-            if (n != null &&
-                (n.value().equals(p.nonTerminal) ||
-                 (n.value().equals("") && getName().equals(p.nonTerminal))))
+            if (t != null &&
+                (t.value().equals(p.nonTerminal)))
+                return buildSequence(p)!=null;
+            if (t != null &&
+                ((t.value().equals("") && getName().equals(p.nonTerminal))))
                 return buildSequence(p)!=null;
-
             if (b != null && getName().equals(p.nonTerminal))
                 return buildSequence(p)!=null;
 
@@ -150,15 +132,27 @@ public class MetaGrammar {
                     argTagged++;
 
             // FIXME: can be smarter here
-            if (names.length==p.count) {
-                int[] ret = new int[p.count];
-                for(int i=0; i<p.count; i++) ret[i] = i;
-                return ret;
-            } else if (argTagged==p.count) {
+            if (argTagged==p.count) {
                 int[] ret = new int[argtags.length];
                 int j = 0;
-                for(int i=0; i<argtags.length; i++)
-                    ret[i] = argtags[i]==null ? -1 : (j++);
+                for(int i=0; i<argtags.length; i++) {
+                    if (argtags[i]==null) continue;
+                    if (argtags[i].value().equals(""))
+                        ret[i] = j++;
+                    else {
+                        ret[i] = -1;
+                        for(int k=0; k<names.length; k++)
+                            if (argtags[i].value().equals(names[k])){
+                                ret[i] = k;
+                                break;
+                            }
+                        if (ret[i]==-1) return null;
+                    }
+                }
+                return ret;
+            } else if (names.length==p.count) {
+                int[] ret = new int[p.count];
+                for(int i=0; i<p.count; i++) ret[i] = i;
                 return ret;
             } else {
                 return null;
@@ -206,7 +200,7 @@ public class MetaGrammar {
                     ret.add(null);
                 }
             }
-            System.err.println("input tree: " + t);
+            //System.err.println("input tree: " + t);
             Object[] o = (Object[])ret.toArray(new Object[0]);
             int max = 0;
             for(int i=0; i<map.length; i++) max = Math.max(map[i], max);
@@ -218,36 +212,17 @@ public class MetaGrammar {
 
 
     public static Union cached = null;
-    public static Union make() {
-        /*
-        if (cached != null) return cached;
-        try {
-            GrammarBindingResolver m = new GrammarBindingResolver();
-            Tree<String> res = new CharParser(MetaGrammar.make()).parse(new FileInputStream("tests/meta.g")).expand1();
-            MetaGrammar.Meta.MetaGrammarFile mgf = m.new MetaGrammarFile(res);
-            MetaGrammar.BuildContext bc = new MetaGrammar.BuildContext(mgf);
-            Union meta = mgf.get("s").build(bc);
-            Tree t = new CharParser(meta).parse(new FileInputStream("tests/meta.g")).expand1();
-            return cached = make(t, "s");
-        } catch (Exception e) {
-            throw new RuntimeException(e);
-        }
-        */
-        return make(MetaGrammarTree.meta, "s");
-    }
+    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, GrammarBindingResolver rm) {
-        System.out.println("Head: " + t.head());
         Tree.TreeFunctor<Object,Object> red = (Tree.TreeFunctor<Object,Object>)t.head();
         MetaGrammarBindings.Grammar g = (MetaGrammarBindings.Grammar)red.invoke(t.children());
         Context cx = new Context(g,rm);
         Union u = null;
-        for(MetaGrammarBindings.NonTerminal nt : g.nonterminals) {
-            System.out.println(nt.name);
+        for(MetaGrammarBindings.NonTerminal nt : g.values()) {
             Union el = (Union)cx.get(nt.name);
             StringBuffer st = new StringBuffer();
             el.toString(st);
-            System.err.println(st);
             if (nt.name.equals(s)) u = el;
         }
         return u;
@@ -266,7 +241,7 @@ public class MetaGrammar {
         }
         public Union build() {
             Union ret = null;
-            for(MetaGrammarBindings.NonTerminal nt : grammar.nonterminals) {
+            for(MetaGrammarBindings.NonTerminal nt : grammar.values()) {
                 Union u = get(nt.name);
                 if ("s".equals(nt.name))
                     ret = u;