X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2FGSS.java;h=7bba6a67240a6ef59a5bbadde7022639160f5699;hp=6db929bb8893f33fde1ff7f70c87b18665b729b4;hb=f71911854d01647a743d52bfccff8d78a4497550;hpb=f169adc2b98fc4034d67bab4dd2938fb2f15e5c4;ds=inline

diff --git a/src/edu/berkeley/sbp/GSS.java b/src/edu/berkeley/sbp/GSS.java
index 6db929b..7bba6a6 100644
--- a/src/edu/berkeley/sbp/GSS.java
+++ b/src/edu/berkeley/sbp/GSS.java
@@ -35,6 +35,8 @@ class GSS {
         /** the token immediately after this phase */
         public  final Token token;
 
+        boolean reducing = false;
+
         /** currently this is necessary only for the code() hack -- it doesn't actually correspond to the input */
         private final int pos;
 
@@ -81,8 +83,7 @@ class GSS {
         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!=parent && !fromEmptyReduction) p.queueReductions(parent);
+            p.addParent(parent, fromEmptyReduction);
         }
         private void newNode3(Node parent, Forest pending, Parser.Table.State state, boolean fromEmptyReduction, Phase start) {
             do {
@@ -105,7 +106,6 @@ class GSS {
         }
 
         
-        boolean reducing = false;
         /** perform all reduction operations */
         public void reduce() {
             reducing = true;
@@ -154,13 +154,13 @@ class GSS {
                 //n.queueEmptyReductions();
                 //}
                 //error.append("  after: " +pendingReductions+ "\n");
-                error.append("  candidate states:\n");
-                for(Phase.Node n : hash.values()) {
+                //error.append("  candidate states:\n");
+                //for(Phase.Node n : hash.values()) {
                     //for(Sequence.Position p : n.state) error.append("        " + p + "\n");
                     //error.append("        --\n");
-                    for(Parser.Table.Reduction r : n.state.getReductions(token)) error.append("        " + r + "\n");
+                //for(Parser.Table.Reduction r : n.state.getReductions(token)) error.append("        " + r + "\n");
                     //error.append("        ==\n");
-                }
+                //}
                 next.error = error.toString();
             }
 
@@ -174,6 +174,11 @@ class GSS {
         /** a node in the GSS */
         public final class Node extends FastSet<Node> {
 
+            public void addParent(Node parent, boolean fromEmptyReduction) {
+                parents().add(parent, true);
+                if (this!=parent && !fromEmptyReduction) queueReductions(parent);
+            }
+
             private Forest.Ref holder = null;
             private boolean allqueued = false;
 
@@ -186,10 +191,11 @@ class GSS {
             public final Parser.Table.State state;
 
             /** which Phase this Node belongs to (node that Node is also a non-static inner class of Phase) */
-            public final Phase phase = Phase.this;
+            public Phase phase() { return Phase.this; }
 
             public  HashMap<Parser.Table.Reduction,Forest> cache() {
-                return cache==null ? (cache = new HashMap<Parser.Table.Reduction,Forest>()) : cache; }
+                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 this; }
@@ -218,20 +224,13 @@ class GSS {
                     // ultimate parent of the last pop, so we need to
                     // cache instances here as a way of avoiding
                     // recreating them.
-                    
-                    // currently we have this weird problem where we
-                    // have to do an individual reduct for each child
-                    // when the reduction length is one (ie the
-                    // children wind up being children of the newly
-                    // created node rather than part of the popped
-                    // sequence
                     if (r.numPop <= 0) continue;
                     if (r.numPop == 1) {
                         Forest ret = n.cache().get(r);
-                        if (ret != null) r.reduce(n, n2, n.phase, ret);
-                        else n.cache().put(r, r.reduce(n, n2, n.phase, null));
+                        if (ret != null) r.reduce(this, n2, ret);
+                        else n.cache().put(r, r.reduce(this, n2, null));
                     } else {
-                        r.reduce(n, n2, Phase.this, null);
+                        r.reduce(this, n2, null);
                     }
                 }
             }
@@ -242,7 +241,7 @@ class GSS {
                 if (reducing)
                     for(Parser.Table.Reduction r : token==null ? state.getEofReductions() : state.getReductions(token))
                         if (r.numPop==0)
-                            r.reduce(this, null, this.phase, r.zero());
+                            r.reduce(this, null, r.zero());
             }
 
             private Node(Node parent, Forest pending, Parser.Table.State state, Phase start) {
@@ -269,5 +268,4 @@ class GSS {
     private static long code(Parser.Table.State state, Phase start) {
         return (((long)state.idx) << 32) | (start==null ? 0 : start.pos);
     }
-    public boolean yak = false;
 }