X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2FWalk.java;h=a82cf522915c115eeb5a8245b73920178c117131;hp=b58dbc5ae926eb42b743b90965d2b0cab149816a;hb=75d0fa39d405292f4b831a6d1743f2aeea01ebd4;hpb=ae0cef03f2e46f6ae6438f9a3e60ca36ff1a4643

diff --git a/src/edu/berkeley/sbp/Walk.java b/src/edu/berkeley/sbp/Walk.java
index b58dbc5..a82cf52 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); 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());
+                if (s.follow != null) cs = cs.intersect(s.follow.getTokenTopology());
             }
 
             if (c != null && e==me) {