X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2FNode.java;h=100f89f614587a12d5e12cb893cecfd3df367960;hb=ce8452c48968090d71261ac773e39134ff764af4;hp=2cb33a9c76efae5dfd4405201da21ccf43541d9c;hpb=4692c8e9ba0c4b44ac5222f5bf5168703c478cbd;p=sbp.git

diff --git a/src/edu/berkeley/sbp/Node.java b/src/edu/berkeley/sbp/Node.java
index 2cb33a9..100f89f 100644
--- a/src/edu/berkeley/sbp/Node.java
+++ b/src/edu/berkeley/sbp/Node.java
@@ -1,10 +1,10 @@
-// Copyright 2006 all rights reserved; see LICENSE file for BSD-style license
+// Copyright 2006-2007 all rights reserved; see LICENSE file for BSD-style license
 
 package edu.berkeley.sbp;
 import edu.berkeley.sbp.*;
 import edu.berkeley.sbp.util.*;
 import edu.berkeley.sbp.Parser.Table.*;
-import edu.berkeley.sbp.Sequence.Position;
+import edu.berkeley.sbp.Sequence.Pos;
 import edu.berkeley.sbp.Sequence.Pos;
 import java.io.*;
 import java.util.*;
@@ -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, phase().parser().cache()), this, r, phase());
+            new Result(r.rewrite(region), this, r, phase());
         }
     }
 
@@ -89,7 +89,7 @@ final class Node
                 if (pos>0)  child.reduce(r, pos-1, target, null);
                 else {
                     Input.Region region = child.phase().getLocation().createRegion(target.getLocation());
-                    new Reduction(child, r, r.rewrite(region, phase().parser().cache()), target);
+                    new Reduction(child, r, r.rewrite(region), target);
                 }
             }
         holder[pos] = old;