From 0a66237ec014b7e8a4c12efd03b72ce88fe278f3 Mon Sep 17 00:00:00 2001 From: adam Date: Wed, 21 Dec 2005 20:43:59 -0500 Subject: [PATCH] checkpoint darcs-hash:20051222014359-5007d-a36a40ea1706ec200b501b21725404b16c391b97.gz --- src/edu/berkeley/sbp/misc/MetaGrammar.java | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/edu/berkeley/sbp/misc/MetaGrammar.java b/src/edu/berkeley/sbp/misc/MetaGrammar.java index d631e8a..ea9ba28 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,15 +133,15 @@ 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)) return ranges(true, (Range[])walk(tree, 0)); + else if ("[~".equals(head)) return ranges(false, (Range[])walk(tree, 0)); 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) -- 1.7.10.4