tentative checkpoint ROLL THIS BACK BUT INCLUDES CRUCIAL FIX

[sbp.git] / src / edu / berkeley / sbp / misc / MetaGrammar.java

diff --git a/src/edu/berkeley/sbp/misc/MetaGrammar.java b/src/edu/berkeley/sbp/misc/MetaGrammar.java
index 53c9bed..4d82952 100644 (file)
--- a/src/edu/berkeley/sbp/misc/MetaGrammar.java
+++ b/src/edu/berkeley/sbp/misc/MetaGrammar.java
@@ -20,8 +20,8 @@ public class MetaGrammar extends StringWalker {
 
     private static Element  set(Range.Set r) { return CharRange.set(r); }
     private static Element  string(String s) { return CharRange.string(s); }
-    private static Atom infer(Element e)  { return infer(Atom.toAtom(e)); }
-    private static Atom infer(Topology t) { return new CharRange((Topology<Character>)t); }
+    private static Atom infer(Element e)  { return infer((Topology<Character>)Atom.toAtom(e)); }
+    private static Atom infer(Topology<Character> t) { return new CharRange(new CharTopology(t)); }
 
     private MetaGrammar() { }
 
@@ -357,7 +357,7 @@ public class MetaGrammar extends StringWalker {
                 public MetaClause element;
                 public MetaInvert(Tree<String> t, MetaConjunct c) { this.element = make(t, c); }
                 public String toString() { return "~"+element; }
-                public Element build(BuildContext bc) { return infer(Atom.toAtom(element.build(bc)).complement()); }
+                public Element build(BuildContext bc) { return infer((Topology<Character>)Atom.toAtom(element.build(bc)).complement()); }
             }
         }