X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2FSequence.java;h=8d6709d5f4e1d0164faacedbe0a6c60eb244ad80;hp=31d8f29ad4061cca5812ef6d819b5025d983ebf6;hb=e6be1f03f79b16cd410991d7e64cfa7beab6de59;hpb=23091054a6842031d168c2628216c2310149cc5d
diff --git a/src/edu/berkeley/sbp/Sequence.java b/src/edu/berkeley/sbp/Sequence.java
index 31d8f29..8d6709d 100644
--- a/src/edu/berkeley/sbp/Sequence.java
+++ b/src/edu/berkeley/sbp/Sequence.java
@@ -7,26 +7,37 @@ 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;
+
+ Atom follow = null;
+
// 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;
}
/** the empty sequence (matches the empty string) */
- public static final Sequence empty = new Sequence.Constant.Empty();
+ static final Sequence empty = new Sequence.Constant.Empty();
+ public static Sequence empty() { return 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,21 +61,13 @@ public abstract class Sequence extends Element implements Iterable {
////////////////////////////////////////////////////////////////////////////////
- public Atom follow = null;
- public final Topology follow() { return follow; }
-
- 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; }
+ public Sequence followedBy(Atom a) { Sequence ret = dup(); ret.follow = a; return ret; }
- protected final Element[] elements;
+ Iterable needs() { return needs; }
+ Iterable hates() { return hates; }
- final HashSet needed = new HashSet();
- final HashSet hated = new HashSet();
- final HashSet needs = new HashSet();
- final HashSet hates = new HashSet();
- public boolean lame = false;
-
- final Position firstp;
Position firstp() { return firstp; }
public Iterator iterator() { return new ArrayIterator(elements); }
@@ -88,7 +91,7 @@ public abstract class Sequence extends Element implements Iterable {
// Position //////////////////////////////////////////////////////////////////////////////
/** the imaginary position before or after an element of a sequence; corresponds to an "LR item" */
- public class Position implements IntegerMappable {
+ class Position implements IntegerMappable {
private Forest zero = null;
public Forest zero() {
@@ -181,15 +184,12 @@ public abstract class Sequence extends Element implements Iterable {
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 {
@@ -200,13 +200,13 @@ public abstract class Sequence extends Element implements Iterable {
Sequence _clone() { return new Singleton(elements,idx); }
}
- public static Unwrap unwrap(Element[] e, Object tag, boolean[] drops) { return new Unwrap(e, tag, drops); }
+ public static Sequence unwrap(Element[] e, Object tag, boolean[] drops) { return new Unwrap(e, tag, drops); }
static class Unwrap extends Sequence {
private boolean[] 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); }
+ Sequence _clone() { return new Unwrap(elements, tag, drops); }
public Forest postReduce(Input.Region loc, Forest[] args, Position p) {
for(int i=0; i {
}
}
- // Repeat //////////////////////////////////////////////////////////////////////////////
-
- /** repeat zero or one times */
- public static Element maybe(Element e) { return new Repeat(e, true, false, null, null); }
- public static Element maybe(Element e, Object tag) { return new Repeat(e, true, false, null, tag); }
- /** repeat zero or more times */
- public static Element many0(Element e) { return new Repeat(e, true, true, null, null); }
- public static Element many0(Element e, Object tag) { return new Repeat(e, true, true, null, tag); }
- /** repeat zero or more times, separated by sep */
- public static Element many0(Element e, Element sep) { return new Repeat(e, true, true, sep, null); }
- public static Element many0(Element e, Element sep, Object tag) { return new Repeat(e, true, true, sep, tag); }
- /** repeat one or more times */
- public static Element many1(Element e) { return new Repeat(e, false, true, null, null); }
- public static Element many1(Element e, Object tag) { return new Repeat(e, false, true, null, tag); }
- /** repeat one or more times, separated by sep */
- public static Element many1(Element e, Element sep) { return new Repeat(e, false, true, sep, null); }
- public static Element many1(Element e, Element sep, Object tag) { return new Repeat(e, false, true, sep, tag); }
-
- /** repeat zero or more times, matching a maximal sequence of atoms */
- public static Element maximal0(Atom e) { return new Repeat.Maximal(e, true, true, null); }
- public static Element maximal0(Atom e, Object tag) { return new Repeat.Maximal(e, true, true, tag); }
- /** repeat one or more times, matching a maximal sequence of atoms */
- public static Element maximal1(Atom e) { return new Repeat.Maximal(e, false, true, null); }
- public static Element maximal1(Atom e, Object tag) { return new Repeat.Maximal(e, false, true, tag); }
- /** repeat one or more times, separated by an atom sep, matching a maximal sequence */
- public static Element maximal1(Element e, Atom sep) { return new Repeat.Maximal(e, false, true, sep, null); }
- public static Element maximal1(Element e, Atom sep, Object tag) { return new Repeat.Maximal(e, false, true, sep, tag); }
-
- public static Element repeatMaximal(Atom e, boolean zero, boolean many, Object tag) {
- return new Repeat.Maximal(e, zero, many, tag); }
- public static Element repeatMaximal(Element e, boolean zero, boolean many, Atom sep, Object tag) {
- return new Repeat.Maximal(e, zero, many, sep, tag); }
- public static Element repeat(Element e, boolean zero, boolean many, Object tag) {
- return new Repeat(e, zero, many, tag); }
- public static Element repeat(Element e, boolean zero, boolean many, Element sep, Object tag) {
- return new Repeat(e, zero, many, sep, tag); }
}