Sequence ret = _clone();
for(Sequence s : needs) { ret.needs.add(s); s.needed.add(ret); }
for(Sequence s : hates) { ret.hates.add(s); s.hated.add(ret); }
- ret.noFollow = noFollow;
+ ret.follow = follow;
return ret;
}
////////////////////////////////////////////////////////////////////////////////
- public Element noFollow = null;
- public final Topology noFollow() { return noFollow==null ? null : Atom.toAtom(noFollow); }
+ public Element follow = null;
+ public final Topology follow() { return follow==null ? null : Atom.toAtom(follow); }
Topology toAtom() {
if (elements.length!=1) throw new RuntimeException("cannot invoke toAtom() on a Sequence with " + elements.length + " elements: " + this);
sb.append(elements[i].toString());
sb.append(' ');
}
+ if (follow != null) {
+ sb.append("-> ");
+ sb.append(follow);
+ }
return sb;
}
Sequence _clone() { return new Singleton(elements,idx); }
}
- public static class Unwrap extends Sequence {
+ public static Unwrap unwrap(Element[] e, Object tag, boolean[] drops) { return new Unwrap(e, tag, drops); }
+ static class Unwrap extends Sequence {
private boolean[] drops;
- public Unwrap(Element[] e) { super(e); this.drops = null; }
- public Unwrap(Element[] e, boolean[] drops) { super(e); this.drops = drops; }
+ private final Object tag;
+ public Unwrap(Element[] e, Object tag) { super(e); this.drops = null; this.tag = tag; }
+ public Unwrap(Element[] e, Object tag, boolean[] drops) { super(e); this.drops = drops; this.tag = tag; }
Sequence _clone() { return new Unwrap(elements, drops); }
public <T> Forest<T> postReduce(Input.Location loc, Forest<T>[] args, Position p) {
for(int i=0; i<args.length; i++) if (args[i]==null) throw new Error();
- if (drops==null) return Forest.create(loc, null, args, new Object[args.length], true, false, p);
+ if (drops==null) return Forest.create(loc, (T)tag, args, new Object[args.length], true, false, p);
int count = 0;
for(int i=0; i<drops.length; i++) if (!drops[i]) count++;
Forest<T>[] args2 = new Forest[count];
int j = 0;
for(int i=0; i<args.length; i++) if (!drops[i]) args2[j++] = args[i];
- return Forest.create(loc, null, args2, new Object[args.length], true, false, p);
+ return Forest.create(loc, (T)tag, args2, new Object[args.length], true, false, p);
}
}
}
public StringBuffer toString(StringBuffer sb, boolean spacing) {
int len = sb.length();
+ if (tag != null)
+ sb.append("\""+StringUtil.escapify(tag.toString(),"\"\r\n")+"\":: ");
super.toString(sb, spacing);
len = sb.length()-len;
if (spacing) for(int i=0; i<50-len; i++) sb.append(' ');
- sb.append(" => ");
- sb.append(tag);
return sb;
}
}
+
+ // Repeat //////////////////////////////////////////////////////////////////////////////
+
+ /** repeat zero or one times */
+ public static Repeat maybe(Element e) { return new Repeat(e, true, false, null, false); }
+ public static Repeat maybe(Element e, Object tag) { return new Repeat(e, true, false, null, false, tag); }
+ /** repeat zero or more times */
+ public static Repeat many0(Element e) { return new Repeat(e, true, true, null, false); }
+ public static Repeat many0(Element e, Object tag) { return new Repeat(e, true, true, null, false, tag); }
+ /** repeat zero or more times, separated by <tt>sep</tt> */
+ public static Repeat many0(Element e, Element sep) { return new Repeat(e, true, true, sep, false); }
+ public static Repeat many0(Element e, Element sep, Object tag) { return new Repeat(e, true, true, sep, false, tag); }
+ /** repeat one or more times */
+ public static Repeat many1(Element e) { return new Repeat(e, false, true, null, false); }
+ public static Repeat many1(Element e, Object tag) { return new Repeat(e, false, true, null, false, tag); }
+ /** repeat one or more times, separated by <tt>sep</tt> */
+ public static Repeat many1(Element e, Element sep) { return new Repeat(e, false, true, sep, false); }
+ public static Repeat many1(Element e, Element sep, Object tag) { return new Repeat(e, false, true, sep, false, tag); }
+
+ /** repeat zero or more times, matching a maximal sequence of atoms */
+ public static Repeat maximal0(Element e) { return new Repeat(e, true, true, null, true); }
+ public static Repeat maximal0(Element e, Object tag) { return new Repeat(e, true, true, null, true, tag); }
+ /** repeat one or more times, matching a maximal sequence of atoms */
+ public static Repeat maximal1(Element e) { return new Repeat(e, false, true, null, true); }
+ public static Repeat maximal1(Element e, Object tag) { return new Repeat(e, false, true, null, true, tag); }
+ /** repeat one or more times, separated by an atom <tt>sep</tt>, matching a maximal sequence */
+ public static Repeat maximal1(Element e, Element sep) { return new Repeat(e, false, true, sep, true); }
+ public static Repeat maximal1(Element e, Element sep, Object tag) { return new Repeat(e, false, true, sep, true, tag); }
+
+
}