checkpoint

[sbp.git] / src / edu / berkeley / sbp / misc / Demo.java

diff --git a/src/edu/berkeley/sbp/misc/Demo.java b/src/edu/berkeley/sbp/misc/Demo.java
index 0bafd76..b118bbf 100644 (file)
--- a/src/edu/berkeley/sbp/misc/Demo.java
+++ b/src/edu/berkeley/sbp/misc/Demo.java
@@ -30,17 +30,16 @@ public class Demo {
         public static @bind.as("/") class Divide   extends BinOp { }
         public static @bind.as("+") class Add      extends BinOp { }
         public static @bind.as("-") class Subtract extends BinOp { }
-
     }
 
 
     // invoke "java -jar edu.berkeley.sbp.jar edu.berkeley.sbp.misc.Demo tests/demo.g <expr>"
     public static void main(String[] s) throws Exception {
 
-        Parser metaGrammarParser   = new CharParser(MetaGrammar.make());
+        Parser metaGrammarParser   = new CharParser(MetaGrammar.newInstance());
         Tree<String> parsedGrammar = metaGrammarParser.parse(new CharInput(new FileInputStream(s[0]))).expand1();
-        GrammarBindingResolver gbr = new AnnotationGrammarBindingResolver(Math.class);
-        Union   mathGrammar        = MetaGrammar.make(parsedGrammar, "Expr", gbr);
+        Grammar.Bindings gbr       = new AnnotationGrammarBindings(Math.class);
+        Union   mathGrammar        = Grammar.create(parsedGrammar, "Expr", gbr);
         Parser  mathParser         = new CharParser(mathGrammar);
 
         System.out.println("about to parse: \""+s[1]+"\"");
@@ -48,7 +47,7 @@ public class Demo {
 
         // below is ugly voodoo which will go away very soon.  ignore it.
         Tree.TreeFunctor tf = (Tree.TreeFunctor)tree.head();
-        Math.Expr e = (Math.Expr)tf.invoke(tree.children());
+        Math.Expr e = (Math.Expr)tf.invoke(tree);
         // above is ugly voodoo which will go away very soon.  ignore it.
 
         System.out.println("done!");