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);
- }
//////////////////////////////////////////////////////////////////////////////