X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2Ftib%2FTibDoc.java;fp=src%2Fedu%2Fberkeley%2Fsbp%2Ftib%2FTibDoc.java;h=42daf15826cac0e5bd93c8be2fd2bb75d18fa012;hp=42d81bc38044a1a241cb3562123367af2b49022e;hb=0632bba5da482b2c39e6959e449259bd6725c213;hpb=6e639c9ed89dfda4b14ac4c768e66d25b91f5037

diff --git a/src/edu/berkeley/sbp/tib/TibDoc.java b/src/edu/berkeley/sbp/tib/TibDoc.java
index 42d81bc..42daf15 100644
--- a/src/edu/berkeley/sbp/tib/TibDoc.java
+++ b/src/edu/berkeley/sbp/tib/TibDoc.java
@@ -684,11 +684,11 @@ toContex ll = prefix ++ (concatMap tl ll) ++ suffix
     public static void main(String[] s) throws Exception {
         try {
 
-            Tree<String> res = new CharParser(MetaGrammar.make()).parse(new FileInputStream(s[0])).expand1();
+            Tree<String> res = new CharParser(MetaGrammar.newInstance()).parse(new FileInputStream(s[0])).expand1();
             
             AnnotationGrammarBindingResolver resolver = new AnnotationGrammarBindingResolver(TD.class);
             resolver.add(MetaGrammarBindings.class, "meta");
-            Union tibgram = MetaGrammar.make(res, "s", resolver);
+            Union tibgram = Grammar.create(res, "s", resolver);
 
             System.err.println("parsing " + s[1]);
             Tree t = new CharParser(tibgram).parse(new Tib(new FileInputStream(s[1]))).expand1();