projects
/
sbp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add support for test cases which do not expand their result
[sbp.git]
/
src
/
edu
/
berkeley
/
sbp
/
Node.java
diff --git
a/src/edu/berkeley/sbp/Node.java
b/src/edu/berkeley/sbp/Node.java
index
2cb33a9
..
100f89f
100644
(file)
--- 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.*;
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.*;
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());
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());
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;
}
}
holder[pos] = old;