X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2FParser.java;fp=src%2Fedu%2Fberkeley%2Fsbp%2FParser.java;h=861c32328961aeff7c4da6658881b33bcf1034b6;hp=8af800585900246ae930d78bcf1f63dc73f18737;hb=4692c8e9ba0c4b44ac5222f5bf5168703c478cbd;hpb=b3b610d65969bcd5325bdba70f9e9c9e03cc83b3

diff --git a/src/edu/berkeley/sbp/Parser.java b/src/edu/berkeley/sbp/Parser.java
index 8af8005..861c323 100644
--- a/src/edu/berkeley/sbp/Parser.java
+++ b/src/edu/berkeley/sbp/Parser.java
@@ -3,6 +3,7 @@
 package edu.berkeley.sbp;
 import edu.berkeley.sbp.util.*;
 import edu.berkeley.sbp.Sequence.Position;
+import edu.berkeley.sbp.Sequence.Pos;
 import java.io.*;
 import java.util.*;
 
@@ -192,7 +193,7 @@ public abstract class Parser<Token, NodeType> {
             // al will be sorted in DECREASING order (al[0] >= al[1])
             ArrayList<Sequence.Position> al = new ArrayList<Sequence.Position>();
             for(State s : all_states) {
-                for(Object po : s) {
+                for(Object po : s.positions()) {
                     Sequence.Position p = (Sequence.Position)po;
                     if (al.contains(p)) continue;
                     int i=0;
@@ -269,33 +270,35 @@ public abstract class Parser<Token, NodeType> {
             private final  transient   HashSet<Position> hs;
             public HashSet<State<Token>> conjunctStates = new HashSet<State<Token>>();
 
-            HashMap<Sequence,State<Token>>      gotoSetNonTerminals = new HashMap<Sequence,State<Token>>();
+            HashMap<Pos,State<Token>>      gotoSetNonTerminals = new HashMap<Pos,State<Token>>();
             private transient TopologicalBag<Token,State<Token>>  gotoSetTerminals    = new TopologicalBag<Token,State<Token>>();
 
-            private           TopologicalBag<Token,Position>      reductions          = new TopologicalBag<Token,Position>();
-            private           HashSet<Position>                   eofReductions       = new HashSet<Position>();
+            private           TopologicalBag<Token,Pos>      reductions          = new TopologicalBag<Token,Pos>();
+            private           HashSet<Pos>                   eofReductions       = new HashSet<Pos>();
             private           TopologicalBag<Token,State<Token>>  shifts              = new TopologicalBag<Token,State<Token>>();
             private           boolean                             accept              = false;
 
             private VisitableMap<Token,State<Token>> oshifts     = null;
-            private VisitableMap<Token,Position>     oreductions = null;
+            private VisitableMap<Token,Pos>     oreductions = null;
             public  final boolean doomed;
 
             // Interface Methods //////////////////////////////////////////////////////////////////////////////
 
             public boolean doomed() { return doomed; }
             boolean                    isAccepting()           { return accept; }
-            public Iterator<Position>  iterator()              { return hs.iterator(); }
+
+            Iterable<Position>  positions()             { return hs; }
+
             boolean                    canShift(Token t)       { return oshifts!=null && oshifts.contains(t); }
             void                       invokeShifts(Token t, GSS.Phase phase, Result r) { oshifts.invoke(t, phase, r); }
             boolean                    canReduce(Token t)        {
                 return oreductions != null && (t==null ? eofReductions.size()>0 : oreductions.contains(t)); }
             void          invokeEpsilonReductions(Token t, Node node) {
-                if (t==null) for(Position r : eofReductions) node.invoke(r, null);
+                if (t==null) for(Pos r : eofReductions) node.invoke(r, null);
                 else         oreductions.invoke(t, node, null);
             }
             void          invokeReductions(Token t, Node node, Result b) {
-                if (t==null) for(Position r : eofReductions) node.invoke(r, b);
+                if (t==null) for(Pos r : eofReductions) node.invoke(r, b);
                 else         oreductions.invoke(t, node, b);
             }
 
@@ -399,10 +402,12 @@ public abstract class Parser<Token, NodeType> {
                                 if (seq.needs.contains(y) || seq.hates.contains(y)) {
                                     // FIXME: assumption that no sequence is ever both usefully (non-lamely) matched
                                     //        and also directly lamely matched
-                                    ((HashMap)gotoSetNonTerminals).put(y, dead_state);
+                                    for(Position pp = y.firstp(); pp != null; pp = pp.next())
+                                        ((HashMap)gotoSetNonTerminals).put(pp, dead_state);
                                     continue OUTER;
                                 }
-                    gotoSetNonTerminals.put(y, s);
+                    for(Position pp = y.firstp(); pp != null; pp = pp.next())
+                        gotoSetNonTerminals.put(pp, s);
                 }
             }