checkpoint

darcs-hash:20060104093644-5007d-7222a88b6eeb5c4c298d2f1519d5c6f1fa1bf71b.gz

diff --git a/src/edu/berkeley/sbp/GSS.java b/src/edu/berkeley/sbp/GSS.java
index 45de091..abe4aa3 100644 (file)
--- a/src/edu/berkeley/sbp/GSS.java
+++ b/src/edu/berkeley/sbp/GSS.java
@@ -78,8 +78,8 @@ class GSS {
         }
         private void newNode2(Node p, Node parent, Forest pending, Parser.Table.State state, boolean fromEmptyReduction, Phase start) {
             p.holder.merge(pending);
         }
         private void newNode2(Node p, Node parent, Forest pending, Parser.Table.State state, boolean fromEmptyReduction, Phase start) {
             p.holder.merge(pending);

-            if (p.parents.contains(parent)) return;
-            p.parents.add(parent, true);
+            if (p.parents().contains(parent)) return;
+            p.parents().add(parent, true);

             if (p!=parent && !fromEmptyReduction) p.queueReductions(parent);
         }
         private void newNode3(Node parent, Forest pending, Parser.Table.State state, boolean fromEmptyReduction, Phase start) {
             if (p!=parent && !fromEmptyReduction) p.queueReductions(parent);
         }
         private void newNode3(Node parent, Forest pending, Parser.Table.State state, boolean fromEmptyReduction, Phase start) {

@@ -163,7 +163,7 @@ class GSS {
         // GSS Nodes //////////////////////////////////////////////////////////////////////////////
 
         /** a node in the GSS */
         // GSS Nodes //////////////////////////////////////////////////////////////////////////////
 
         /** a node in the GSS */

-        public final class Node {
+        public final class Node extends FastSet<Node> {

 
             private Forest.Ref holder = null;
             private boolean allqueued = false;
 
             private Forest.Ref holder = null;
             private boolean allqueued = false;

@@ -171,7 +171,7 @@ class GSS {
             private HashMap<Parser.Table.Reduction,Forest> cache = null;
 
             /** the set of nodes to which there is an edge starting at this node */
             private HashMap<Parser.Table.Reduction,Forest> cache = null;
 
             /** the set of nodes to which there is an edge starting at this node */

-            public final FastSet<Node> parents = new FastSet<Node>();  /* ALLOC */
+            //public final FastSet<Node> parents = new FastSet<Node>();  /* ALLOC */

 
             /** what state this node is in */
             public final Parser.Table.State state;
 
             /** what state this node is in */
             public final Parser.Table.State state;

@@ -183,15 +183,14 @@ class GSS {
                 return cache==null ? (cache = new HashMap<Parser.Table.Reduction,Forest>()) : cache; }
             public  Forest.Ref holder() { return holder==null ? (holder = new Forest.Ref()) : holder; }
             public  Forest pending() { return Phase.this.closed ? holder().resolve() : holder; }
                 return cache==null ? (cache = new HashMap<Parser.Table.Reduction,Forest>()) : cache; }
             public  Forest.Ref holder() { return holder==null ? (holder = new Forest.Ref()) : holder; }
             public  Forest pending() { return Phase.this.closed ? holder().resolve() : holder; }

-            public  FastSet<Node> parents() { return parents; }
+            public  FastSet<Node> parents() { return this; }

 
             /** FIXME */
             public void queueReductions() {
                 if (allqueued) return;
                 allqueued = true;
 
             /** FIXME */
             public void queueReductions() {
                 if (allqueued) return;
                 allqueued = true;

-                FastSet<Node> h = new FastSet<Node>();
-                for(Node n : parents) h.add(n);
-                for(Node n : h) queueReductions(n);
+                int where = parents().size();
+                for(int i=0; i<where; i++) queueReductions(get(i));

             }
 
             /** FIXME */
             }
 
             /** FIXME */

@@ -240,7 +239,7 @@ class GSS {
             private Node(Node parent, Forest pending, Parser.Table.State state, Phase start) {
                 this.state = state;
                 if (pending != null) this.holder().merge(pending);
             private Node(Node parent, Forest pending, Parser.Table.State state, Phase start) {
                 this.state = state;
                 if (pending != null) this.holder().merge(pending);

-                if (parent != null) parents.add(parent, true);
+                if (parent != null) parents().add(parent, true);

                 if (Phase.this.hash.get(code(state, start)) != null) throw new Error("severe problem!");
                 Phase.this.hash.put(code(state, start), this);
                 Phase.this.numNodes++;
                 if (Phase.this.hash.get(code(state, start)) != null) throw new Error("severe problem!");
                 Phase.this.hash.put(code(state, start), this);
                 Phase.this.numNodes++;

diff --git a/src/edu/berkeley/sbp/util/FastSet.java b/src/edu/berkeley/sbp/util/FastSet.java
index a433b7c..086f636 100644 (file)
--- a/src/edu/berkeley/sbp/util/FastSet.java
+++ b/src/edu/berkeley/sbp/util/FastSet.java
@@ -1,7 +1,7 @@
 package edu.berkeley.sbp.util;
 import java.util.*;
 
 package edu.berkeley.sbp.util;
 import java.util.*;
 

-public final class FastSet<T> implements Iterator<T>, Iterable<T> {
+public /*final*/ class FastSet<T> implements Iterator<T>, Iterable<T> {

 
     public static final int INITIAL_SIZE = 128;
 
 
     public static final int INITIAL_SIZE = 128;
 

@@ -14,6 +14,11 @@ public final class FastSet<T> implements Iterator<T>, Iterable<T> {
     public void        remove()   { throw new Error(); }
     public boolean     hasNext()  { return only==null ? i<size : i<1; }
     public T           next()     { return only==null ? (T)array[i++] : (i++)==0 ? only : null; }
     public void        remove()   { throw new Error(); }
     public boolean     hasNext()  { return only==null ? i<size : i<1; }
     public T           next()     { return only==null ? (T)array[i++] : (i++)==0 ? only : null; }

+    public T get(int i) {
+        if (i==0 && only!=null) return only;
+        if (array==null) return null;
+        return (T)array[i];
+    }

 
     public FastSet() { }
     public FastSet(T t) { only = t; }
 
     public FastSet() { }
     public FastSet(T t) { only = t; }