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

diff --git a/src/edu/berkeley/sbp/Walk.java b/src/edu/berkeley/sbp/Walk.java
index db76747..b58dbc5 100644
--- a/src/edu/berkeley/sbp/Walk.java
+++ b/src/edu/berkeley/sbp/Walk.java
@@ -37,7 +37,13 @@ abstract class Walk<T> {
         else if (e instanceof Sequence) return sequence((Sequence)e);
         else if (e instanceof Union) {
             T ret = bottom(e);
-            for(Sequence s : (Union)e) ret = union((Union)e, ret, walk(s));
+            for(Sequence s : (Union)e) {
+                ret = union((Union)e, ret, walk(s));
+
+                // FIXME
+                for(Sequence ss : s.needs()) ret = union((Union)e, ret, walk(ss));
+                for(Sequence ss : s.hates()) ret = union((Union)e, ret, walk(ss));
+            }
             return ret;
         } else {
             throw new Error("unknown element of class " + e.getClass().getName() + ": " + e);
@@ -75,9 +81,9 @@ abstract class Walk<T> {
     }
 
 
-    // Token-Set //////////////////////////////////////////////////////////////////////////////
+    // Input-Set //////////////////////////////////////////////////////////////////////////////
 
-    static abstract class WalkTokenSet<Tok extends Token> extends Walk<Topology<Tok>> {
+    static abstract class WalkTokenSet<Tok extends Input> extends Walk<Topology<Tok>> {
         public Topology<Tok> cs;
         public WalkTokenSet(Topology<Tok> cs)          { this.cs = cs; }
         public WalkTokenSet(Topology<Tok> cs, Cache c) { super(c); this.cs = cs; }
@@ -85,18 +91,18 @@ abstract class Walk<T> {
         public Topology<Tok> walkAtom(Atom r)          { cs = cs.union(r); return cs; }
     }
 
-    class First<Tok extends Token> extends WalkTokenSet<Tok> {
+    static class First<Tok extends Input> extends WalkTokenSet<Tok> {
         public First(Topology<Tok> cs, Walk.Cache cache) { super(cs, cache); }
         public Topology<Tok> sequence(Sequence seq) {
             for(Position p = seq.firstp(); p!=null && !p.isLast(); p = p.next()) {
                 walk(p.element());
-                if (!p.element().possiblyEpsilon(c)) break;
+                if (!c.possiblyEpsilon(p.element())) break;
             }
             return cs;
         }
     }
 
-    static class Follow<Tok extends Token> extends WalkTokenSet<Tok> {
+    static class Follow<Tok extends Input> extends WalkTokenSet<Tok> {
         private final Element me;
         private final HashSet<Element> all;
         private boolean eof = false;
@@ -129,8 +135,8 @@ abstract class Walk<T> {
                 Sequence a = (Sequence)x;
                 Position mp = null;
                 for(Position pos = a.firstp(); pos != null && !pos.isLast(); pos = pos.next()) {
-                    if (matched) cs = cs.union(new First<Tok>(cs.empty(), c).walk(pos.element()));
-                    if (pos.isLast()) { matched = (matched && pos.element().possiblyEpsilon(c)); continue; }
+                    if (matched) cs = cs.union(c.first(pos.element(), cs.empty()));
+                    if (pos.isLast()) { matched = (matched && c.possiblyEpsilon(pos.element())); continue; }
                     boolean good = false;
                     if (e instanceof Atom) {
                         Topology top = c.atoms.get(pos.element());
@@ -149,7 +155,7 @@ abstract class Walk<T> {
 
             if (e instanceof Sequence) {
                 Sequence s = (Sequence)e;
-                if (s.noFollow() != null) cs = cs.minus(s.noFollow());
+                if (s.follow() != null) cs = cs.intersect(s.follow());
             }
 
             if (c != null && e==me) {
@@ -170,8 +176,18 @@ 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 HashMapBag<Element,Element>  ys = new HashMapBag<Element,Element>();
         public HashMap<Element,Topology> atoms = new HashMap<Element,Topology>();
+        public <Tok extends Input> Topology<Tok> first(Element e, Topology<Tok> empty) {
+            return new Walk.First<Tok>(empty, this).walk(e);
+        }
+        final boolean possiblyEpsilon(Element e) {
+            Walk.Cache cache = this;
+            Boolean ret = possiblyEpsilon.get(e);
+            if (ret != null) return ret.booleanValue();
+            ret = new Walk.PossiblyEpsilon().walk(e) ? Boolean.TRUE : Boolean.FALSE;
+            possiblyEpsilon.put(e, ret);
+            return ret;
+        }
     }
 }