X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2FWalk.java;fp=src%2Fedu%2Fberkeley%2Fsbp%2FWalk.java;h=c6bb514e31f4a14bdb072de5e12cf5aa4af83153;hp=b3432a906b5cd536894cfe895f60dfbb27799e11;hb=d28917b3c84c429e8fd6587717df9e90a894b18f;hpb=b320f26b6e2cc13dcfcd810c7d5b507b942e8c70

diff --git a/src/edu/berkeley/sbp/Walk.java b/src/edu/berkeley/sbp/Walk.java
index b3432a9..c6bb514 100644
--- a/src/edu/berkeley/sbp/Walk.java
+++ b/src/edu/berkeley/sbp/Walk.java
@@ -88,7 +88,7 @@ abstract class Walk<T> {
         public WalkTokenSet(Topology<Tok> cs)          { this.cs = cs; }
         public WalkTokenSet(Topology<Tok> cs, Cache c) { super(c); this.cs = cs; }
         public Topology<Tok> bottom(Element e)         { return cs; }
-        public Topology<Tok> walkAtom(Atom r)          { cs = cs.union(r.underlying()); return cs; }
+        public Topology<Tok> walkAtom(Atom r)          { cs = cs.union(r.getTokenTopology()); return cs; }
     }
 
     static class First<Tok extends Input> extends WalkTokenSet<Tok> {
@@ -155,7 +155,7 @@ abstract class Walk<T> {
 
             if (e instanceof Sequence) {
                 Sequence s = (Sequence)e;
-                if (s.follow() != null) cs = cs.intersect(s.follow().underlying());
+                if (s.follow() != null) cs = cs.intersect(s.follow().getTokenTopology());
             }
 
             if (c != null && e==me) {