group[j].build(cx, u2, cnt);
}
if (sequences.length==1) break;
- Sequence seq = Sequence.singleton(u2);
+ Sequence seq = Sequence.newSingletonSequence(u2);
for(Sequence s : bad2) seq = seq.not(s);
u.add(seq);
- bad2.add(Sequence.singleton(u2));
+ bad2.add(Sequence.newSingletonSequence(u2));
}
}
}
HashSet<Sequence> bad2 = new HashSet<Sequence>();
Union urep = new Union(null, false);
- urep.add(Sequence.empty);
+ urep.add(Sequence.newEmptySequence());
if (sep != null)
- urep.add(Sequence.singleton(new Element[] { cx.get(sep), u }, 1));
+ urep.add(Sequence.newSingletonSequence(new Element[] { cx.get(sep), u }, 1));
else
- urep.add(Sequence.singleton(new Element[] { u }, 0));
+ urep.add(Sequence.newSingletonSequence(new Element[] { u }, 0));
for(int i=0; i<sequences.length; i++) {
Seq[] group = sequences[i];
for(int j=0; j<group.length; j++) {
Union u3 = new Union(null, false);
group[j].build(cx, u3, this);
- Sequence s = Sequence.unwrap(new Element[] { u3, urep },
- cx.rm.repeatTag(),
- new boolean[] { false, false });
+ Sequence s = Sequence.newUnwrapSequence(new Element[] { u3, urep },
+ cx.rm.repeatTag(),
+ new boolean[] { false, false });
u2.add(s);
}
if (sequences.length==1) break;
- Sequence seq = Sequence.singleton(u2);
+ Sequence seq = Sequence.newSingletonSequence(u2);
for(Sequence s : bad2) seq = seq.not(s);
u.add(seq);
- bad2.add(Sequence.singleton(u2));
+ bad2.add(Sequence.newSingletonSequence(u2));
}
}
}
return ret;
}
public Sequence build0(Context cx, NonTerminalNode cnt) {
- boolean dropAll = false;
- if (tag!=null && tag.endsWith("()")) dropAll = true;
boolean[] drops = new boolean[elements.length];
Element[] els = new Element[elements.length];
for(int i=0; i<elements.length; i++) {
tag = elements[i].getOwnerTag();
}
Sequence ret = null;
- if (dropAll) ret = Sequence.drop(els);
- else {
- Production prod = new Production(tag, (cnt==null?null:cnt.name), els, drops);
- ret = cx.rm.createSequence(prod);
- if (ret == null) {
- int idx = -1;
- for(int i=0; i<els.length; i++)
- if (!drops[i])
- if (idx==-1) idx = i;
- else throw new Error("multiple non-dropped elements in sequence: " + Sequence.drop(els));
- if (idx != -1) ret = Sequence.singleton(els, idx);
- else ret = Sequence.drop(els);
- }
+ Production prod = new Production(tag, (cnt==null?null:cnt.name), els, drops);
+ ret = cx.rm.createSequence(prod);
+ if (ret == null) {
+ int idx = -1;
+ for(int i=0; i<els.length; i++)
+ if (!drops[i])
+ if (idx==-1) idx = i;
+ else throw new Error("multiple non-dropped elements in sequence: " + Sequence.newDropSequence(els));
+ if (idx != -1) ret = Sequence.newSingletonSequence(els, idx);
+ else ret = Sequence.newDropSequence(els);
}
if (this.follow != null)
ret = ret.followedBy(this.follow.toAtom(cx));
public static @bind.as("()") ElementNode epsilon() { return new Constant(epsilon); }
private static Union epsilon = new Union("()");
- static { epsilon.add(Sequence.empty); }
+ static { epsilon.add(Sequence.newEmptySequence()); }
public static class NonTerminalReferenceNode extends ElementNode {
public String nonTerminal;
Union u = new Union(null, false);
Sequence s = body.build(cx, u, null);
Union u2 = new Union(null, false);
- u2.add(Sequence.singleton(new Element[] {
+ u2.add(Sequence.newSingletonSequence(new Element[] {
CharAtom.leftBrace,
cx.get("ws"),
u,
}
public Element build(Context cx, NonTerminalNode cnt) {
return (!max)
- ? Sequence.repeat(e.build(cx, null), zero, many, sep==null ? null : sep.build(cx, null), cx.rm.repeatTag())
+ ? Repeat.repeat(e.build(cx, null), zero, many, sep==null ? null : sep.build(cx, null), cx.rm.repeatTag())
: sep==null
- ? Sequence.repeatMaximal(e.toAtom(cx), zero, many, cx.rm.repeatTag())
- : Sequence.repeatMaximal(e.build(cx, null), zero, many, sep.toAtom(cx), cx.rm.repeatTag());
+ ? Repeat.repeatMaximal(e.toAtom(cx), zero, many, cx.rm.repeatTag())
+ : Repeat.repeatMaximal(e.build(cx, null), zero, many, sep.toAtom(cx), cx.rm.repeatTag());
}
}