X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2FSequence.java;h=3e260f14bbd6500196a197e2afb858bb5bf2d7df;hb=ea7e036150d05484ee7867e73d80b5789972edbc;hp=f4315182d654770e32ee45c8cc9017a3d17dda1e;hpb=75d0fa39d405292f4b831a6d1743f2aeea01ebd4;p=sbp.git
diff --git a/src/edu/berkeley/sbp/Sequence.java b/src/edu/berkeley/sbp/Sequence.java
index f431518..3e260f1 100644
--- a/src/edu/berkeley/sbp/Sequence.java
+++ b/src/edu/berkeley/sbp/Sequence.java
@@ -1,3 +1,5 @@
+// Copyright 2006 all rights reserved; see LICENSE file for BSD-style license
+
package edu.berkeley.sbp;
import edu.berkeley.sbp.util.*;
import edu.berkeley.sbp.*;
@@ -8,33 +10,26 @@ import java.lang.reflect.*;
import java.lang.ref.*;
/** juxtaposition; zero or more adjacent Elements; can specify a rewriting */
-public abstract class Sequence extends Element implements Iterable {
+public abstract class Sequence implements Iterable, SequenceOrElement {
protected final Element[] elements;
- final HashSet hated = new HashSet();
+ boolean needed_or_hated = false;
+ boolean in_a_union = false;
final HashSet needs = new HashSet();
final HashSet hates = new HashSet();
+ // FIXME: these are ugly -- migrate into Cache
+ HashMap canNeed = new HashMap();
+ HashMap canKill = new HashMap();
+
final Position firstp;
Atom follow = null;
// Static Constructors //////////////////////////////////////////////////////////////////////////////
- abstract Sequence _clone();
- Sequence dup() {
- Sequence ret = _clone();
- for(Sequence s : needs) { ret.needs.add(s); }
- for(Sequence s : hates) { ret.hates.add(s); s.hated.add(ret); }
- ret.follow = follow;
- return ret;
- }
-
- /** create an empty sequence (matches the empty string) */
- public static Sequence create() { return new Sequence.Constant.Empty(); }
-
/** create a sequence of one element */
public static Sequence create(Element e) { return create(new Element[] { e }, 0); }
@@ -60,34 +55,61 @@ public abstract class Sequence extends Element implements Iterable {
: new RewritingSequence(head, e, drop);
}
- ////////////////////////////////////////////////////////////////////////////////
-
/** return a new sequence identical to this one, but with a positive conjunct s */
- public Sequence and(Sequence s) { Sequence ret = dup(); ret.needs.add(s); return ret; }
+ public Sequence and(Sequence s) {
+ if (s.in_a_union)
+ throw new RuntimeException("you may not use a sequence as a conjunct if it belongs to a Union");
+ Sequence ret = dup();
+ ret.needs.add(s);
+ s.needed_or_hated=true;
+ return ret;
+ }
/** return a new sequence identical to this one, but with a negative conjunct s */
- public Sequence not(Sequence s) { Sequence ret = dup(); ret.hates.add(s); s.hated.add(ret); return ret; }
+ public Sequence andnot(Sequence s) {
+ if (s.in_a_union)
+ throw new RuntimeException("you may not use a sequence as a conjunct if it belongs to a Union");
+ Sequence ret = dup();
+ ret.hates.add(s);
+ s.needed_or_hated=true;
+ return ret;
+ }
/** return a new sequence identical to this one, but with a follow-set restricted to a */
public Sequence followedBy(Atom a) { Sequence ret = dup(); ret.follow = a; return ret; }
+ ////////////////////////////////////////////////////////////////////////////////
+
+ abstract Sequence _clone();
+ private Sequence dup() {
+ Sequence ret = _clone();
+ for(Sequence s : needs) { ret.needs.add(s); }
+ for(Sequence s : hates) { ret.hates.add(s); }
+ ret.follow = follow;
+ return ret;
+ }
+
Iterable needs() { return needs; }
Iterable hates() { return hates; }
Position firstp() { return firstp; }
+ Position lastp() { return firstp().last(); }
public Iterator iterator() { return new ArrayIterator(elements); }
protected Sequence(Element[] elements) {
this.elements = elements;
- this.firstp = new Position(0);
+ for(int i=0; i {
/** the imaginary position before or after an element of a sequence; corresponds to an "LR item" */
class Position implements IntegerMappable {
+ public int ord = -1;
+
private Forest zero = null;
- public Forest zero() {
+ public Forest zero(Input.Region reg) {
if (zero != null) return zero;
- if (pos > 0) throw new Error();
- return zero = rewrite(null);
+ if (pos > 0) throw new RuntimeException("Position.zero(): pos>0");
+ return zero = rewrite(reg);
}
-
final int pos;
private final Position next;
+ private final Position prev;
final Forest[] holder;
- private Position(int pos) {
+ private Position(int pos, Position prev) {
this.pos = pos;
- this.next = pos==elements.length ? null : new Position(pos+1);
+ this.next = pos==elements.length ? null : new Position(pos+1, this);
this.holder = new Forest[elements.length];
+ this.prev = prev;
}
boolean isFirst() { return pos==0; }
@@ -130,20 +155,20 @@ public abstract class Sequence extends Element implements Iterable {
/** true iff this Position is the last one in the sequence */
public boolean isLast() { return next()==null; }
+ public Position last() { return isLast() ? this : next().last(); }
+ public Position prev() { return prev; }
// Position /////////////////////////////////////////////////////////////////////////////////
final Forest rewrite(Input.Region loc) { return rewrite(loc, true); }
private final Forest rewrite(Input.Region loc, boolean epsilonCheck) {
- if (epsilonCheck && this==firstp()) return epsilonForm();
+ if (epsilonCheck && this==firstp()) return epsilonForm(loc);
for(int i=0; i ret = Sequence.this.postReduce(loc, holder, this);
- //for(int k=0; k {
StringBuffer toString(StringBuffer sb) { return toString(sb, true); }
StringBuffer toString(StringBuffer sb, boolean spacing) {
for(int i=0; i ");
sb.append(follow);
}
+ for(Sequence s : needs) {
+ sb.append("& ");
+ sb.append(s);
+ }
+ for(Sequence s : hates) {
+ sb.append("&~ ");
+ sb.append(s);
+ }
return sb;
}
@@ -184,18 +217,15 @@ public abstract class Sequence extends Element implements Iterable {
static class Constant extends Sequence {
private final Object result;
- public Constant(Element[] e, Object result) { super(e); this.result = result; }
+ public Constant(Element[] e, Object result) {
+ super(e);
+ if (result==null) throw new Error("constant sequences may not have result==null");
+ this.result = result;
+ }
Sequence _clone() { return new Constant(elements, result); }
public Forest postReduce(Input.Region loc, Forest[] args, Position p) {
return (Forest)Forest.create(loc, result, null, false);
}
- static class Drop extends Constant {
- 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[] { }); } }
}
static class Singleton extends Sequence {
@@ -209,7 +239,7 @@ public abstract class Sequence extends Element implements Iterable {
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) { this(e, tag, null); }
public Unwrap(Element[] e, Object tag, boolean[] drops) { super(e); this.drops = drops; this.tag = tag; }
Sequence _clone() { return new Unwrap(elements, tag, drops); }
public Forest postReduce(Input.Region loc, Forest[] args, Position p) {
@@ -224,30 +254,15 @@ public abstract class Sequence extends Element implements Iterable {
}
}
-
-
- static class RegionRewritingSequence extends RewritingSequence {
- private Functor tagf;
- public RegionRewritingSequence(Functor tagfunctor, Element[] e, boolean[] drops) {
- super(null, e, drops);
- this.tagf = tagfunctor;
- }
- public Forest postReduce(Input.Region loc, Forest[] args, Position p) {
- this.tag = tagf.invoke(loc);
- Forest ret = super.postReduce(loc, args, p);
- this.tag = null;
- return ret;
- }
- }
-
static class RewritingSequence extends Sequence {
- /*private*/public /*final*/ Object tag;
+ private Object tag;
private final boolean[] drops;
private int count = 0;
Sequence _clone() { return new RewritingSequence(tag, elements, drops); }
public RewritingSequence(Object tag, Element[] e) { this(tag, e, null); }
public RewritingSequence(Object tag, Element[] e, boolean[] drops) {
super(e);
+ if (tag==null) throw new Error();
this.tag = tag;
this.drops = drops == null ? new boolean[e.length] : drops;
for(int i=0; i {
Forest[] args2 = new Forest[count];
int j = 0;
for(int i=0; i