X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2Fmisc%2FDemo.java;h=b118bbfdfc3a8f4247fb2adb865dabf4fb141279;hp=566e05d19de5a3db835972cf0923e17ac0c7e44d;hb=5fdbef59b07d4769f79337e77d1ee6c1d5762f52;hpb=c8a17fdd2e149fe5feecd96c71b7f2cab286ab96

diff --git a/src/edu/berkeley/sbp/misc/Demo.java b/src/edu/berkeley/sbp/misc/Demo.java
index 566e05d..b118bbf 100644
--- 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]+"\"");