X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;ds=inline;f=src%2Fedu%2Fberkeley%2Fsbp%2FSequence.java;h=1d5634378dce266e177bcfaef05b0b34dd8829bb;hb=173e1696d10a91db6f5a919dbb2b2ed2c6e2a227;hp=c3c259f1cf9e6c7cce86ee98ab812ec56147dbc5;hpb=5ea3b9182192a0fbb7a0bd86b919384ddaeff29a;p=sbp.git
diff --git a/src/edu/berkeley/sbp/Sequence.java b/src/edu/berkeley/sbp/Sequence.java
index c3c259f..1d56343 100644
--- a/src/edu/berkeley/sbp/Sequence.java
+++ b/src/edu/berkeley/sbp/Sequence.java
@@ -7,18 +7,29 @@ import java.util.*;
import java.lang.reflect.*;
import java.lang.ref.*;
-/** juxtaposition; zero or more adjacent Elements; can specify a rewriting */
+/** juxtaposition; zero or more adjacent Elements; can specify a rewriting */
public abstract class Sequence extends Element implements Iterable {
+ protected final Element[] elements;
+
+ final HashSet hated = new HashSet();
+
+ final HashSet needs = new HashSet();
+ final HashSet hates = new HashSet();
+
+ final Position firstp;
+
+ public Atom follow = null;
+ public final Atom follow() { return follow; }
+
// Static Constructors //////////////////////////////////////////////////////////////////////////////
abstract Sequence _clone();
Sequence dup() {
Sequence ret = _clone();
- for(Sequence s : needs) { ret.needs.add(s); s.needed.add(ret); }
+ for(Sequence s : needs) { ret.needs.add(s); }
for(Sequence s : hates) { ret.hates.add(s); s.hated.add(ret); }
ret.follow = follow;
- ret.lame = lame;
return ret;
}
@@ -26,7 +37,7 @@ public abstract class Sequence extends Element implements Iterable {
public static final Sequence empty = new Sequence.Constant.Empty();
/** after matching the sequence, do not add anything to the output tree */
- public static Sequence drop(Element[] e, boolean lame) { return new Constant.Drop(e, lame); }
+ public static Sequence drop(Element[] e) { return new Constant.Drop(e); }
/** after matching the sequence, insert a constant into the output tree */
public static Sequence constant(Element[] e, Object o) { return new Constant(e, o); }
@@ -50,27 +61,12 @@ public abstract class Sequence extends Element implements Iterable {
////////////////////////////////////////////////////////////////////////////////
- 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);
- return Atom.toAtom(elements[0]);
- }
-
- public Sequence and(Sequence s) { Sequence ret = dup(); ret.needs.add(s); s.needed.add(ret); return ret; }
+ public Sequence and(Sequence s) { Sequence ret = dup(); ret.needs.add(s); return ret; }
public Sequence not(Sequence s) { Sequence ret = dup(); ret.hates.add(s); s.hated.add(ret); return ret; }
- protected final Element[] elements;
-
- final HashSet needed = new HashSet();
- final HashSet hated = new HashSet();
- final HashSet needs = new HashSet();
- final HashSet hates = new HashSet();
- public boolean lame = false;
+ public Iterable needs() { return needs; }
+ public Iterable hates() { return hates; }
- final Position firstp;
Position firstp() { return firstp; }
public Iterator iterator() { return new ArrayIterator(elements); }
@@ -80,10 +76,10 @@ public abstract class Sequence extends Element implements Iterable {
}
// DO NOT MESS WITH THE FOLLOWING LINE!!!
- private Forest.Ref epsilonForm = null;
+ private Forest.Many epsilonForm = null;
Forest epsilonForm() {
if (epsilonForm!=null) return epsilonForm;
- epsilonForm = new Forest.Ref();
+ epsilonForm = new Forest.Many();
epsilonForm.merge(firstp().rewrite(null, false));
return epsilonForm;
}
@@ -184,18 +180,15 @@ public abstract class Sequence extends Element implements Iterable {
public Constant(Element[] e, Object result) { super(e); this.result = result; }
Sequence _clone() { return new Constant(elements, result); }
public Forest postReduce(Input.Region loc, Forest[] args, Position p) {
- return (Forest)Forest.leaf(loc, result);
+ return (Forest)Forest.create(loc, result, null, false);
}
static class Drop extends Constant {
- Sequence _clone() { return new Drop(elements, lame); }
- public Drop(Element[] e, boolean lame) {
- super(e, null);
- this.lame = lame;
- }
+ Sequence _clone() { return new Drop(elements); }
+ public Drop(Element[] e) { super(e, null); }
}
static class Empty extends Sequence.Constant.Drop {
Sequence _clone() { return new Empty(); }
- public Empty() { super(new Element[] { }, false); } }
+ public Empty() { super(new Element[] { }); } }
}
static class Singleton extends Sequence {