preliminary support for serialization of parse tables

[sbp.git] / src / edu / berkeley / sbp / Sequence.java

diff --git a/src/edu/berkeley/sbp/Sequence.java b/src/edu/berkeley/sbp/Sequence.java
index 430f298..d0c3dfd 100644 (file)
--- 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.*;
 
 /** <font color=green>juxtaposition; zero or more adjacent Elements; can specify a rewriting</font> */
 import java.lang.ref.*;
 
 /** <font color=green>juxtaposition; zero or more adjacent Elements; can specify a rewriting</font> */

-public abstract class Sequence implements Iterable<Element>, SequenceOrElement {
+public abstract class Sequence implements Iterable<Element>, SequenceOrElement, Serializable {

 
 

-    protected final Element[] elements;
+    protected transient final Element[] elements;

 
     boolean needed_or_hated = false;
     boolean in_a_union = false;
 
     boolean needed_or_hated = false;
     boolean in_a_union = false;

@@ -26,7 +26,7 @@ public abstract class Sequence implements Iterable<Element>, SequenceOrElement {
 
     final Position firstp;
 
 
     final Position firstp;
 

-    Atom follow = null;
+    transient Atom follow = null;

 
     private static int global_sernum = 0;
     private int sernum = global_sernum++;
 
     private static int global_sernum = 0;
     private int sernum = global_sernum++;

@@ -137,7 +137,7 @@ public abstract class Sequence implements Iterable<Element>, SequenceOrElement {
     static abstract class Pos implements IntegerMappable, Comparable<Pos>, Serializable {
 
         public int ord = -1;
     static abstract class Pos implements IntegerMappable, Comparable<Pos>, Serializable {
 
         public int ord = -1;

-        private transient Sequence owner;
+        private Sequence owner;

 
         public int ord()     { return ord; }
 
 
         public int ord()     { return ord; }
 

@@ -223,8 +223,12 @@ public abstract class Sequence implements Iterable<Element>, SequenceOrElement {
         public final <T> Forest<T> rewrite(Input.Region loc) {
             if (isFirst()) return owner().epsilonForm(loc);
             for(int i=0; i<pos; i++) if (holder[i]==null) throw new Error("realbad " + i);
         public final <T> Forest<T> rewrite(Input.Region loc) {
             if (isFirst()) return owner().epsilonForm(loc);
             for(int i=0; i<pos; i++) if (holder[i]==null) throw new Error("realbad " + i);

-            for(int i=pos; i<owner().elements.length; i++) {
-                if (holder[i]==null) holder[i] = ((Union)owner().elements[i]).epsilonForm(loc);
+            Position p = this;
+            for(int i=pos; p!=null && p.next()!=null; p=p.next(), i++) {
+                if (holder[i]==null)
+                    holder[i] = owner().elements==null
+                        ? new Forest.Many() /* FIXME */
+                        : ((Union)owner().elements[i]).epsilonForm(loc);

                 if (holder[i]==null) throw new Error("bad");
             }
             return owner().postReduce(loc, holder, this);
                 if (holder[i]==null) throw new Error("bad");
             }
             return owner().postReduce(loc, holder, this);

@@ -281,6 +285,7 @@ public abstract class Sequence implements Iterable<Element>, SequenceOrElement {
         public <T> Forest<T> postReduce(Input.Region loc, Forest<T>[] args, Position p) { return args[idx]; }
         Sequence _clone() { return new Singleton(elements,idx); }
         Forest epsilonForm(Input.Region loc) {
         public <T> Forest<T> postReduce(Input.Region loc, Forest<T>[] 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);
         }
     }
             return ((Union)elements[idx]).epsilonForm(loc);
         }
     }