checkpoint

[sbp.git] / src / edu / berkeley / sbp / tib / TibDoc.java

diff --git a/src/edu/berkeley/sbp/tib/TibDoc.java b/src/edu/berkeley/sbp/tib/TibDoc.java
index 42d81bc..42daf15 100644 (file)
--- 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();