From e298db431295ba8870587daceaf6c584c9f07312 Mon Sep 17 00:00:00 2001 From: adam Date: Wed, 21 Dec 2005 20:47:16 -0500 Subject: [PATCH] checkpoint darcs-hash:20051222014716-5007d-4c4c2ad9462ca6d46812534223c80892a3a8338a.gz --- src/edu/berkeley/sbp/misc/MetaGrammar.java | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/edu/berkeley/sbp/misc/MetaGrammar.java b/src/edu/berkeley/sbp/misc/MetaGrammar.java index ea9ba28..d03baaf 100644 --- a/src/edu/berkeley/sbp/misc/MetaGrammar.java +++ b/src/edu/berkeley/sbp/misc/MetaGrammar.java @@ -136,20 +136,20 @@ public class MetaGrammar extends ReflectiveWalker { 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 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 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); - } ////////////////////////////////////////////////////////////////////////////// -- 1.7.10.4