checkpoint

darcs-hash:20060722234456-5007d-9cd269e491f7a78f8580acec36b15d568f90e4da.gz

diff --git a/src/edu/berkeley/sbp/Element.java b/src/edu/berkeley/sbp/Element.java
index 4ccde61..16ae2f0 100644 (file)
--- a/src/edu/berkeley/sbp/Element.java
+++ b/src/edu/berkeley/sbp/Element.java
@@ -8,7 +8,7 @@ import java.lang.reflect.*;
 import java.lang.ref.*;
 
 /** <font color=green>the root superclass for all components of the grammar (terminals, nonterminals, literals, etc)</font> */
-public abstract class Element {
+public abstract class Element implements SequenceOrElement {
 
     /** sorry, you can't make up new, custom elements */
     Element() { }

diff --git a/src/edu/berkeley/sbp/Parser.java b/src/edu/berkeley/sbp/Parser.java
index 4aa6515..a74ea5e 100644 (file)
--- a/src/edu/berkeley/sbp/Parser.java
+++ b/src/edu/berkeley/sbp/Parser.java
@@ -77,7 +77,7 @@ public abstract class Parser<Tok, Result> {
 
         public final Walk.Cache cache = this;
 
-        private void walk(Element e, HashSet<Element> hs) {
+        private void walk(Element e, HashSet<SequenceOrElement> hs) {
             if (e==null) return;
             if (hs.contains(e)) return;
             hs.add(e);
@@ -85,7 +85,7 @@ public abstract class Parser<Tok, Result> {
             for(Sequence s : (Union)e)
                 walk(s, hs);
         }
-        private void walk(Sequence s, HashSet<Element> hs) {
+        private void walk(Sequence s, HashSet<SequenceOrElement> hs) {
             hs.add(s);
             for(Position p = s.firstp(); p != null; p = p.next())
                 walk(p.element(), hs);
@@ -114,9 +114,9 @@ public abstract class Parser<Tok, Result> {
             cache.eof.put(start0, true);
 
             // construct the set of states
-            HashSet<Element>                        all_elements  = new HashSet<Element>();
+            HashSet<SequenceOrElement>                        all_elements  = new HashSet<SequenceOrElement>();
             walk(start0, all_elements);
-            for(Element e : all_elements)
+            for(SequenceOrElement e : all_elements)
                 cache.ys.addAll(e, new Walk.YieldSet(e, cache).walk());
             HashSet<Position> hp = new HashSet<Position>();
             reachable(start0, hp);
@@ -166,7 +166,7 @@ public abstract class Parser<Tok, Result> {
             public  final     int               idx    = master_state_idx++;
             private final     HashSet<Position> hs;
 
-            public transient HashMap<Element,State<Tok>>          gotoSetNonTerminals = new HashMap<Element,State<Tok>>();
+            public transient HashMap<Sequence,State<Tok>>         gotoSetNonTerminals = new HashMap<Sequence,State<Tok>>();
             private transient TopologicalBag<Tok,State<Tok>>     gotoSetTerminals    = new TopologicalBag<Tok,State<Tok>>();
 
             private           TopologicalBag<Tok,Position> reductions          = new TopologicalBag<Tok,Position>();
@@ -219,7 +219,7 @@ public abstract class Parser<Tok, Result> {
              */
             public State(HashSet<Position> hs,
                          HashMap<HashSet<Position>,State<Tok>> all_states,
-                         HashSet<Element> all_elements) {
+                         HashSet<SequenceOrElement> all_elements) {
                 this.hs = hs;
 
                 // register ourselves in the all_states hash so that no
@@ -258,17 +258,17 @@ public abstract class Parser<Tok, Result> {
                 //         to avoid having to iteratively construct our set of States as shown in most
                 //         expositions of the algorithm (ie "keep doing XYZ until things stop changing").
 
-                HashMapBag<Element,Position> move = new HashMapBag<Element,Position>();
+                HashMapBag<SequenceOrElement,Position> move = new HashMapBag<SequenceOrElement,Position>();
                 for(Position p : hs) {
                     Element e = p.element();
                     if (e==null) continue;
-                    for(Element y : cache.ys.getAll(e)) {
+                    for(SequenceOrElement y : cache.ys.getAll(e)) {
                         HashSet<Position> hp = new HashSet<Position>();
                         reachable(p.next(), hp);
                         move.addAll(y, hp);
                     }
                 }
-                OUTER: for(Element y : move) {
+                OUTER: for(SequenceOrElement y : move) {
                     HashSet<Position> h = move.getAll(y);
                     State<Tok> s = all_states.get(h) == null ? new State<Tok>(h, all_states, all_elements) : all_states.get(h);
                     // if a reduction is "lame", it should wind up in the dead_state after reducing
@@ -279,13 +279,13 @@ public abstract class Parser<Tok, Result> {
                                 for(Sequence seq : u)
                                     if (seq.needs.contains((Sequence)y) || seq.hates.contains((Sequence)y)) {
                                         // FIXME: what if there are two "routes" to get to the sequence?
-                                        ((HashMap)gotoSetNonTerminals).put(y, dead_state);
+                                        ((HashMap)gotoSetNonTerminals).put((Sequence)y, dead_state);
                                         continue OUTER;
                                     }
                             }
                         }
+                        gotoSetNonTerminals.put((Sequence)y, s);
                     }
-                    gotoSetNonTerminals.put(y, s);
                 }
             }
 

diff --git a/src/edu/berkeley/sbp/Sequence.java b/src/edu/berkeley/sbp/Sequence.java
index f431518..b67f8a7 100644 (file)
--- a/src/edu/berkeley/sbp/Sequence.java
+++ b/src/edu/berkeley/sbp/Sequence.java
@@ -8,7 +8,7 @@ import java.lang.reflect.*;
 import java.lang.ref.*;
 
 /** <font color=green>juxtaposition; zero or more adjacent Elements; can specify a rewriting</font> */
-public abstract class Sequence extends Element implements Iterable<Element> {
+public abstract class Sequence /*extends Element*/ implements Iterable<Element>, SequenceOrElement {
 
     protected final Element[] elements;
 

diff --git a/src/edu/berkeley/sbp/SequenceOrElement.java b/src/edu/berkeley/sbp/SequenceOrElement.java
new file mode 100644 (file)
index 0000000..c67173f
--- /dev/null
+++ b/src/edu/berkeley/sbp/SequenceOrElement.java
@@ -0,0 +1,11 @@
+package edu.berkeley.sbp;
+import edu.berkeley.sbp.util.*;
+import edu.berkeley.sbp.*;
+import edu.berkeley.sbp.*;
+import java.io.*;
+import java.util.*;
+import java.lang.reflect.*;
+import java.lang.ref.*;
+
+interface SequenceOrElement {
+}

diff --git a/src/edu/berkeley/sbp/Walk.java b/src/edu/berkeley/sbp/Walk.java
index a82cf52..3d23469 100644 (file)
--- a/src/edu/berkeley/sbp/Walk.java
+++ b/src/edu/berkeley/sbp/Walk.java
@@ -7,10 +7,10 @@ import java.util.*;
 import java.lang.reflect.*;
 import java.lang.ref.*;
 
-/** a traversal of the grammar performed by mapping from Elements to a lattice and computing the resulting LUB */
+/** a traversal of the grammar performed by mapping from SequenceOrElements to a lattice and computing the resulting LUB */
 abstract class Walk<T> {
-    protected HashSet<Element> acc = new HashSet<Element>();
-    protected abstract T bottom(Element e);
+    protected HashSet<SequenceOrElement> acc = new HashSet<SequenceOrElement>();
+    protected abstract T bottom(SequenceOrElement e);
 
     protected final Cache c;
     public Walk() { this(null); }
@@ -26,13 +26,13 @@ abstract class Walk<T> {
     public      T walkAtom(Atom r) { return walk(r); }
     public      T union(Union u, T a, T b) { return  bottom(u); }
     public      T sequence(Sequence s, T a, T b) { return  bottom(s); }
-    protected   T walk(Element e) {
+    protected   T walk(SequenceOrElement e) {
         if (acc.contains(e)) return bottom(e);
         acc.add(e);
         return walk2(e);
     }
 
-    protected T walk2(Element e) {
+    protected T walk2(SequenceOrElement e) {
         if      (e instanceof Atom)     return walkAtom((Atom)e);
         else if (e instanceof Sequence) return sequence((Sequence)e);
         else if (e instanceof Union) {
@@ -50,13 +50,13 @@ abstract class Walk<T> {
         }
     }
 
-    static class YieldSet extends Walk<HashSet<Element>> {
-        private final Element e;
-        public final HashSet<Element> walk() { return walk(e); }
-        public YieldSet(Element e, Cache c)  { super(c); this.e = e; }
-        public HashSet<Element> bottom(Element e)     { return acc; }
-        public HashSet<Element> sequence(Sequence seq) { return bottom(seq); }
-        public HashSet<Element> walkAtom(Atom r) {
+    static class YieldSet extends Walk<HashSet<SequenceOrElement>> {
+        private final SequenceOrElement e;
+        public final HashSet<SequenceOrElement> walk() { return walk(e); }
+        public YieldSet(SequenceOrElement e, Cache c)  { super(c); this.e = e; }
+        public HashSet<SequenceOrElement> bottom(SequenceOrElement e)     { return acc; }
+        public HashSet<SequenceOrElement> sequence(Sequence seq) { return bottom(seq); }
+        public HashSet<SequenceOrElement> walkAtom(Atom r) {
             c.atoms.put(e, c.atoms.get(e)==null ? r : c.atoms.get(e).union(r));
             return super.walkAtom(r);
         }
@@ -69,9 +69,9 @@ abstract class Walk<T> {
         public Boolean walkAtom(Atom r) { return false; }
         public Boolean sequence(Sequence s, Boolean a, Boolean b)  { return new Boolean(a && b); }
         public Boolean union(Union u, Boolean a, Boolean b)     { return new Boolean(a || b); }
-        public Boolean bottom(Element e)    { return (e instanceof Union) ? false : true; }
-        private HashMap<Element,Boolean> hm = new HashMap<Element,Boolean>();
-        protected Boolean walk(Element e) {
+        public Boolean bottom(SequenceOrElement e)    { return (e instanceof Union) ? false : true; }
+        private HashMap<SequenceOrElement,Boolean> hm = new HashMap<SequenceOrElement,Boolean>();
+        protected Boolean walk(SequenceOrElement e) {
             if (hm.get(e) != null) return hm.get(e);
             hm.put(e, false);
             Boolean ret = walk2(e);
@@ -87,7 +87,7 @@ abstract class Walk<T> {
         public Topology<Tok> cs;
         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> bottom(SequenceOrElement e)         { return cs; }
         public Topology<Tok> walkAtom(Atom r)          { cs = cs.union(r.getTokenTopology()); return cs; }
     }
 
@@ -103,15 +103,15 @@ abstract class Walk<T> {
     }
 
     static class Follow<Tok extends Input> extends WalkTokenSet<Tok> {
-        private final Element me;
-        private final HashSet<Element> all;
+        private final SequenceOrElement me;
+        private final HashSet<SequenceOrElement> all;
         private boolean eof = false;
         public boolean includesEof() { return eof; }
-        public Follow(Topology<Tok> cs, Element me, HashSet<Element> all, Cache c)  { super(cs, c); this.me = me; this.all = all; }
-        public Topology<Tok> bottom(Element e)                       { return cs; }
+        public Follow(Topology<Tok> cs, SequenceOrElement me, HashSet<SequenceOrElement> all, Cache c)  { super(cs, c); this.me = me; this.all = all; }
+        public Topology<Tok> bottom(SequenceOrElement e)                       { return cs; }
         public Topology<Tok> sequence(Sequence seq)                  { return cs; }
-        public Topology<Tok> walkAtom(Atom r) { return walk((Element)r); }
-        public Topology<Tok> walk(Element e) {
+        public Topology<Tok> walkAtom(Atom r) { return walk((SequenceOrElement)r); }
+        public Topology<Tok> walk(SequenceOrElement e) {
             if (acc.contains(e)) return bottom(e);
             acc.add(e);
 
@@ -129,7 +129,7 @@ abstract class Walk<T> {
             eof = c.eof.get(e) != null && c.eof.get(e).booleanValue();
             cs = cso.empty();
 
-            for(Element x : all) {
+            for(SequenceOrElement x : all) {
                 boolean matched = false;
                 if (!(x instanceof Sequence)) continue;
                 Sequence a = (Sequence)x;
@@ -173,15 +173,15 @@ abstract class Walk<T> {
     }
 
     static class Cache {
-        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 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) {
+        public final HashMap<SequenceOrElement,Boolean> possiblyEpsilon = new HashMap<SequenceOrElement,Boolean>();
+        public HashMap<SequenceOrElement,Boolean> eof = new HashMap<SequenceOrElement,Boolean>();
+        public HashMap<SequenceOrElement,Topology> follow = new HashMap<SequenceOrElement,Topology>();
+        public HashMapBag<SequenceOrElement,SequenceOrElement>  ys = new HashMapBag<SequenceOrElement,SequenceOrElement>();
+        public HashMap<SequenceOrElement,Topology> atoms = new HashMap<SequenceOrElement,Topology>();
+        public <Tok extends Input> Topology<Tok> first(SequenceOrElement e, Topology<Tok> empty) {
             return new Walk.First<Tok>(empty, this).walk(e);
         }
-        final boolean possiblyEpsilon(Element e) {
+        final boolean possiblyEpsilon(SequenceOrElement e) {
             Walk.Cache cache = this;
             Boolean ret = possiblyEpsilon.get(e);
             if (ret != null) return ret.booleanValue();