X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2FWalk.java;h=db76747d04fd98d92f30deb8c1c744eae70e7adf;hp=0d4233a0f80c590cf49bec0586efcebbc5e6b214;hb=8a9fc9f2357e54052374cf2ef003630a486a6c0a;hpb=a22c5074e705e3ffcf03e9f9d174aed8ef79fc91;ds=sidebyside

diff --git a/src/edu/berkeley/sbp/Walk.java b/src/edu/berkeley/sbp/Walk.java
index 0d4233a..db76747 100644
--- a/src/edu/berkeley/sbp/Walk.java
+++ b/src/edu/berkeley/sbp/Walk.java
@@ -1,7 +1,6 @@
 package edu.berkeley.sbp;
-import edu.berkeley.sbp.util.*;
-import edu.berkeley.sbp.*;
 import edu.berkeley.sbp.*;
+import edu.berkeley.sbp.util.*;
 import edu.berkeley.sbp.Sequence.Position;
 import java.io.*;
 import java.util.*;
@@ -138,7 +137,7 @@ abstract class Walk<T> {
                         if (top==null) continue;
                         if (!(top.containsAll(((Atom)e)))) continue;
                     } else {
-                        if (c.ys.get(pos.element()).contains(e)) good = true;
+                        if (c.ys.contains(pos.element(),e)) good = true;
                     }
                     if (good) {
                         mp = pos;
@@ -171,7 +170,8 @@ abstract class Walk<T> {
         public final HashMap<Element,Boolean> possiblyEpsilon = new HashMap<Element,Boolean>();
         public HashMap<Element,Boolean> eof = new HashMap<Element,Boolean>();
         public HashMap<Element,Topology> follow = new HashMap<Element,Topology>();
-        public HashMap<Element,HashSet<Element>>  ys            = new HashMap<Element,HashSet<Element>>();
+        //public HashMap<Element,HashSet<Element>>  ys            = new HashMap<Element,HashSet<Element>>();
+        public HashMapBag<Element,Element>  ys = new HashMapBag<Element,Element>();
         public HashMap<Element,Topology> atoms = new HashMap<Element,Topology>();
     }
 }