X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2Fmisc%2FMetaGrammar.java;h=d03baafadaf2938edb169d81143f19d28e13b3bd;hp=d631e8ab0f4a6d57dd3a3302e77236378d6426bb;hb=e298db431295ba8870587daceaf6c584c9f07312;hpb=2c399ca4d7e658266c974f43f26e5a55944f9042

diff --git a/src/edu/berkeley/sbp/misc/MetaGrammar.java b/src/edu/berkeley/sbp/misc/MetaGrammar.java
index d631e8a..d03baaf 100644
--- a/src/edu/berkeley/sbp/misc/MetaGrammar.java
+++ b/src/edu/berkeley/sbp/misc/MetaGrammar.java
@@ -122,8 +122,10 @@ public class MetaGrammar extends ReflectiveWalker {
         else if ("**".equals(head)) return Repeat.maximal(Repeat.many0((Element)walk(tree.child(0))));
         else if ("++".equals(head)) return Repeat.maximal(Repeat.many1((Element)walk(tree.child(0))));
         else if ("?".equals(head))  return Repeat.maybe((Element)walk(tree.child(0)));
-        else if ("&".equals(head)) return ((PreSequence)walk(tree,0)).and(new PreSequence((Element[])Reflection.lub((Object[])walk(tree, 1)), null).buildSequence(null, true, false));
-        else if ("&~".equals(head)) return ((PreSequence)walk(tree,0)).not(new PreSequence((Element[])Reflection.lub((Object[])walk(tree, 1)), null).buildSequence(null, true, false));
+        else if ("&".equals(head))
+            return ((PreSequence)walk(tree,0)).and(new PreSequence((Element[])Reflection.lub((Object[])walk(tree, 1)), null).buildSequence(null, true, false));
+        else if ("&~".equals(head))
+            return ((PreSequence)walk(tree,0)).not(new PreSequence((Element[])Reflection.lub((Object[])walk(tree, 1)), null).buildSequence(null, true, false));
         else if ("epsilon".equals(head)) return Union.epsilon;
         else if ("()".equals(head)) return Union.epsilon;
         else if (")".equals(head)) return SELF;
@@ -131,23 +133,23 @@ public class MetaGrammar extends ReflectiveWalker {
         else if ("::=".equals(head)) return nonTerminal(string(tree.child(0)), (PreSequence[][])walk(tree, 1), false, false);
         else if ("!::=".equals(head)) return nonTerminal(string(tree.child(0)), (PreSequence[][])walk(tree, 1), false, true);
         else if ("(".equals(head)) return nonTerminal("anon"+(anon++), (PreSequence[][])walk(tree, 0), false, false);
+        else if ("literal".equals(head)) { Element ret = string(string(tree.child(0))); dropAll.add(ret); return ret; }
+        else if ("-".equals(head)) return new Range(walk(tree, 0).toString().charAt(0), walk(tree,1).toString().charAt(0));
+        else if ("range".equals(head)) return new Range(walk(tree, 0).toString().charAt(0), walk(tree,0).toString().charAt(0));
+        else if ("[".equals(head) || "[~".equals(head)) {
+            boolean positive = "[".equals(head);
+            Range[] rr = (Range[])walk(tree, 0);
+            Range.Set ret = positive ? new Range.Set() : new Range.Set(new Range(true, true));
+            if (rr != null)
+                for(Range r : rr)
+                    if (positive) ret.add(r);
+                    else          ret.remove(r);
+            return set(ret);
+        }
         else return super.walk(tree);
     }
 
     public Object    gram(Object o, Object g, Object o2) { return g; }
-    public Element   literal(String s) { Element ret = string(s); dropAll.add(ret); return ret; }
-    public Range     _minus_(char a, char b) { return new Range(a, b); }
-    public Range     range(char a)         { return new Range(a, a); }
-    public Element   _leftbracket_       (Range[] rr) { return ranges(true, rr); }
-    public Element   _leftbracket__tilde_(Range[] rr) { return ranges(false,  rr); }
-    public Element   ranges(boolean positive, Range[] rr) {
-        Range.Set ret = positive ? new Range.Set() : new Range.Set(new Range(true, true));
-        if (rr != null)
-            for(Range r : rr)
-                if (positive) ret.add(r);
-                else          ret.remove(r);
-        return set(ret);
-    }
 
     //////////////////////////////////////////////////////////////////////////////