checkpoint

[sbp.git] / src / edu / berkeley / sbp / meta / MetaGrammarBindings.java

diff --git a/src/edu/berkeley/sbp/meta/MetaGrammarBindings.java b/src/edu/berkeley/sbp/meta/MetaGrammarBindings.java
index 3790227..74e8a31 100644 (file)
--- a/src/edu/berkeley/sbp/meta/MetaGrammarBindings.java
+++ b/src/edu/berkeley/sbp/meta/MetaGrammarBindings.java
@@ -68,7 +68,7 @@ public class MetaGrammarBindings extends AnnotationGrammarBindings {
             Atom ret = null;
             for(Seq[] ss : sequences)
                 for(Seq s : ss)
-                    ret = ret==null ? s.toAtom(cx) : infer(ret.union(s.toAtom(cx)));
+                    ret = ret==null ? s.toAtom(cx) : (Atom)ret.union(s.toAtom(cx));
             return ret;
         }
         public void build(Context cx, Union u, NonTerminalNode cnt) {
@@ -406,7 +406,7 @@ public class MetaGrammarBindings extends AnnotationGrammarBindings {
     public static @bind.as("\r")          String lf() { return "\r"; }
 
     //static Atom infer(Element e)  { return infer((Topology<Character>)Atom.toAtom(e)); }
-    static Atom infer(Topology<Character> t) { return new CharAtom(new CharTopology(t)); }
+    static Atom infer(Object t) { return (Atom)t; }
 
     public static class Context {
         public HashMap<String,Union> map = new HashMap<String,Union>();
@@ -497,10 +497,12 @@ public class MetaGrammarBindings extends AnnotationGrammarBindings {
         public String getLabel() { return label; }
     }
 
+    /*
     static class Invert extends Atom {
         private final Atom a;
         public Invert(Atom a) { this.a = a; }
         public Topology top() { return a.complement(); }
         public String toString() { return "~"+a; }
     }
+    */
 }