X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2FNode.java;fp=src%2Fedu%2Fberkeley%2Fsbp%2FNode.java;h=740d8a6d49bcac0e4410de67809ddc6fff6cd03b;hp=ccc2516d3d6011c04525d55b3260f9468c138a9a;hb=8cf79c4b9e5a26ef65bd4af600946b45dbf28a8a;hpb=33d7b8fa4974bad96108c11e5548b354cf10ecb8

diff --git a/src/edu/berkeley/sbp/Node.java b/src/edu/berkeley/sbp/Node.java
index ccc2516..740d8a6 100644
--- a/src/edu/berkeley/sbp/Node.java
+++ b/src/edu/berkeley/sbp/Node.java
@@ -74,7 +74,7 @@ final class Node
         if (r.numPops()!=0)  reduce(r, r.numPops()-1, phase(), only);
         else {
             Input.Region region = phase().getLocation().createRegion(phase().getLocation());
-            new Result(r.rewrite(region), this, r, phase());
+            Result.newResult(r.rewrite(region), this, r, phase());
         }
     }
 
@@ -95,13 +95,13 @@ final class Node
         holder[pos] = old;
     }
 
-    Node(GSS.Phase phase, Result result, State state, boolean fromEmptyReduction) {
+    Node(GSS.Phase phase, Result pred, State state, boolean fromEmptyReduction) {
         this.phase = phase;
         this.state = state;
         this.fromEmptyReduction = fromEmptyReduction;
-        if (phase.hash.get(state, result.phase()) != null) throw new Error("severe problem!");
-        phase.hash.put(state, result.phase(), this);
-        addResult(result);
+        if (phase.hash.get(state, pred.phase()) != null) throw new Error("severe problem!");
+        phase.hash.put(state, pred.phase(), this);
+        addResult(pred);
         state.invokeEpsilonReductions(phase().token, this);
     }