X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2FSequence.java;h=d0c3dfd7c63345f4028abcd7a555b3d5199b913c;hp=b0a2de49cd4063abd6b64ca265204c6a974c6639;hb=bbb16d2522ed587238fd7a69e346d5e5e8f2551a;hpb=a61c67f0e574923f63bc939a79b5e9714a87a123
diff --git a/src/edu/berkeley/sbp/Sequence.java b/src/edu/berkeley/sbp/Sequence.java
index b0a2de4..d0c3dfd 100644
--- a/src/edu/berkeley/sbp/Sequence.java
+++ b/src/edu/berkeley/sbp/Sequence.java
@@ -10,9 +10,9 @@ import java.lang.reflect.*;
import java.lang.ref.*;
/** juxtaposition; zero or more adjacent Elements; can specify a rewriting */
-public abstract class Sequence implements Iterable, SequenceOrElement {
+public abstract class Sequence implements Iterable, SequenceOrElement, Serializable {
- protected final Element[] elements;
+ protected transient final Element[] elements;
boolean needed_or_hated = false;
boolean in_a_union = false;
@@ -26,7 +26,7 @@ public abstract class Sequence implements Iterable, SequenceOrElement {
final Position firstp;
- Atom follow = null;
+ transient Atom follow = null;
private static int global_sernum = 0;
private int sernum = global_sernum++;
@@ -137,7 +137,7 @@ public abstract class Sequence implements Iterable, SequenceOrElement {
static abstract class Pos implements IntegerMappable, Comparable, Serializable {
public int ord = -1;
- private transient Sequence owner;
+ private Sequence owner;
public int ord() { return ord; }
@@ -221,10 +221,14 @@ public abstract class Sequence implements Iterable, SequenceOrElement {
// Position /////////////////////////////////////////////////////////////////////////////////
public final Forest rewrite(Input.Region loc) {
- if (isFirst()) owner().epsilonForm(loc);
+ if (isFirst()) return owner().epsilonForm(loc);
for(int i=0; i, SequenceOrElement {
public Forest postReduce(Input.Region loc, Forest[] args, Position p) { return args[idx]; }
Sequence _clone() { return new Singleton(elements,idx); }
Forest epsilonForm(Input.Region loc) {
+ if (elements==null) return new Forest.Many(); /* FIXME */
return ((Union)elements[idx]).epsilonForm(loc);
}
}