X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2FParser.java;h=f2bb701710bc40901be1ed9275586dd194ae51c2;hp=10768f66e35d1228f3c2db4c7ae6a22923a0d431;hb=a2008a0c57702f49ed7f8be682e4e29484fded38;hpb=778717ec55a53ceab4847f2a0922478d6c06e4e1

diff --git a/src/edu/berkeley/sbp/Parser.java b/src/edu/berkeley/sbp/Parser.java
index 10768f6..f2bb701 100644
--- a/src/edu/berkeley/sbp/Parser.java
+++ b/src/edu/berkeley/sbp/Parser.java
@@ -122,6 +122,8 @@ public abstract class Parser<Token, NodeType> {
             walk(start0, all_elements);
             for(SequenceOrElement e : all_elements)
                 cache.ys.addAll(e, new Walk.YieldSet(e, cache).walk());
+            for(SequenceOrElement e : all_elements)
+                cache.ys2.addAll(e, new Walk.YieldSet2(e, cache).walk());
             HashSet<Position> hp = new HashSet<Position>();
             reachable(start0, hp);
 
@@ -289,7 +291,8 @@ public abstract class Parser<Token, NodeType> {
                 for(Position p : hs) {
                     Element e = p.element();
                     if (e==null) continue;
-                    for(SequenceOrElement y : cache.ys.getAll(e)) {
+                    for(SequenceOrElement y : cache.ys2.getAll(e)) {
+                        //System.out.println(e + " yields " + y);
                         HashSet<Position> hp = new HashSet<Position>();
                         reachable(p.next(), hp);
                         move.addAll(y, hp);