X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2Fmisc%2FDemo.java;h=a9601b926b6c72938525ff7cce6dbbcca0923559;hb=173e1696d10a91db6f5a919dbb2b2ed2c6e2a227;hp=3d0a3a6b442173f2d65e1c08ef1526b631b520ba;hpb=0632bba5da482b2c39e6959e449259bd6725c213;p=sbp.git

diff --git a/src/edu/berkeley/sbp/misc/Demo.java b/src/edu/berkeley/sbp/misc/Demo.java
index 3d0a3a6..a9601b9 100644
--- a/src/edu/berkeley/sbp/misc/Demo.java
+++ b/src/edu/berkeley/sbp/misc/Demo.java
@@ -30,7 +30,6 @@ 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 { }
-
     }
 
 
@@ -39,7 +38,7 @@ public class Demo {
 
         Parser metaGrammarParser   = new CharParser(MetaGrammar.newInstance());
         Tree<String> parsedGrammar = metaGrammarParser.parse(new CharInput(new FileInputStream(s[0]))).expand1();
-        GrammarBindingResolver gbr = new AnnotationGrammarBindingResolver(Math.class);
+        Grammar.Bindings gbr       = new AnnotationGrammarBindings(Math.class);
         Union   mathGrammar        = Grammar.create(parsedGrammar, "Expr", gbr);
         Parser  mathParser         = new CharParser(mathGrammar);
 
@@ -47,7 +46,7 @@ public class Demo {
         Tree tree = mathParser.parse(new CharInput(new StringReader(s[1]))).expand1();
 
         // below is ugly voodoo which will go away very soon.  ignore it.
-        Tree.TreeFunctor tf = (Tree.TreeFunctor)tree.head();
+        TreeFunctor tf = (TreeFunctor)tree.head();
         Math.Expr e = (Math.Expr)tf.invoke(tree);
         // above is ugly voodoo which will go away very soon.  ignore it.