X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2FParser.java;h=5b31b3103459251c690eaa34f5000717b2217ba5;hp=6bf274d30ecb6bde3135d9fce9061321c9a63d47;hb=888e9ccbab5f458a727c16da9d9291fd8951d909;hpb=96a2822a729e563a64173f22dc184bc972a200ef

diff --git a/src/edu/berkeley/sbp/Parser.java b/src/edu/berkeley/sbp/Parser.java
index 6bf274d..5b31b31 100644
--- a/src/edu/berkeley/sbp/Parser.java
+++ b/src/edu/berkeley/sbp/Parser.java
@@ -13,24 +13,13 @@ public abstract class Parser<T extends Token, R> {
 
     private final Table pt;
 
-    private static void reachable(Element e, HashSet<Position> h) {
-        if (e instanceof Atom) return;
-        for(Sequence s : ((Union)e))
-            reachable(s.firstp(), h);
-    }
-    private static void reachable(Position p, HashSet<Position> h) {
-        if (h.contains(p)) return;
-        h.add(p);
-        if (p.element() != null) reachable(p.element(), h);
-    }
-
     /**
      *  create a parser to parse the grammar with start symbol <tt>u</tt>
      */
     protected Parser(Union u)  { this.pt = new Table(u, top()); }
     protected Parser(Table pt) { this.pt = pt; }
 
-    public abstract Forest<R> shiftedToken(T t);
+    public abstract Forest<R> shiftedToken(T t, Token.Location loc);
     public abstract Topology<T> top();
 
 
@@ -40,12 +29,14 @@ public abstract class Parser<T extends Token, R> {
     /** parse <tt>input</tt>, using the table <tt>pt</tt> to drive the parser */
     public Forest<R> parse(Token.Stream<T> input) throws IOException, Failed {
         GSS gss = new GSS();
-        GSS.Phase current = gss.new Phase(null, input.next());
+        Token.Location loc = input.getLocation();
+        GSS.Phase current = gss.new Phase(null, input.next(), loc);
         current.newNode(null, null, pt.start, true, null);
         for(;;) {
-            GSS.Phase next = gss.new Phase(current, input.next());
+            loc = input.getLocation();
+            GSS.Phase next = gss.new Phase(current, input.next(), loc);
             current.reduce();
-            Forest forest = current.token==null ? null : shiftedToken((T)current.token);
+            Forest forest = current.token==null ? null : shiftedToken((T)current.token, loc);
             current.shift(next, forest);
             if (current.isDone()) return (Forest<R>)current.finalResult;
             current.checkFailure();
@@ -62,7 +53,7 @@ public abstract class Parser<T extends Token, R> {
         public Failed() { this("", null); }
         public Failed(String message, Token.Location loc) { this.location = loc; this.message = message; }
         public Token.Location getLocation() { return location; }
-        public String toString() { return message + (location==null ? "" : (" at " + location + "\n" + location.getContext())); }
+        public String toString() { return message + (location==null ? "" : (" at " + location)); }
     }
 
     public static class Ambiguous extends RuntimeException {
@@ -80,12 +71,10 @@ public abstract class Parser<T extends Token, R> {
 
     // Table //////////////////////////////////////////////////////////////////////////////
 
-    static class Top extends Union { public Top() { super("0"); } }
-
     /** an SLR(1) parse table which may contain conflicts */
     static class Table {
 
-        private final Union start0 = new Top();
+        private final Union start0 = new Union("0");
         private final Sequence start0seq;
         
         public final Walk.Cache cache = new Walk.Cache();
@@ -95,8 +84,6 @@ public abstract class Parser<T extends Token, R> {
             reachable(start0, hp);
             return hp;
         }
-        public Position firstPosition()          { return start0seq.firstp(); }
-        public Position lastPosition()           { Position ret = start0seq.firstp(); while(!ret.isLast()) ret = ret.next(); return ret; }
         
         private void walk(Element e, HashSet<Element> hs) {
             if (e==null) return;
@@ -135,12 +122,16 @@ public abstract class Parser<T extends Token, R> {
         public Table(Topology top) { this("s", top); }
         public Table(String startSymbol, Topology top) { this(new Union(startSymbol), top); }
         public Table(Union u, Topology top) {
+            cache.eof.put(start0, true);
             start0seq = new Sequence.Singleton(u, null, null);
+            cache.eof.put(start0seq, true);
             start0.add(start0seq);
 
             // construct the set of states
             HashMap<HashSet<Position>,State>   all_states    = new HashMap<HashSet<Position>,State>();
             HashSet<Element>                   all_elements  = walk();
+            all_elements.add(start0);
+            all_elements.add(start0seq);
             for(Element e : all_elements)
                 cache.ys.put(e, new Walk.YieldSet(e, cache).walk());
             this.start = new State(closure(), all_states, all_elements);
@@ -150,7 +141,7 @@ public abstract class Parser<T extends Token, R> {
                 for(Position p : state.hs) {
 
                     // the Grammar's designated "last position" is the only accepting state
-                    if (p==lastPosition())
+                    if (p==start0seq.firstp().next())
                         state.accept = true;
 
                     // FIXME: how does right-nullability interact with follow restrictions?
@@ -236,7 +227,7 @@ public abstract class Parser<T extends Token, R> {
                     Atom a = (Atom)position.element();
                     HashSet<Position> hp = new HashSet<Position>();
                     reachable(position.next(), hp);
-                    bag0.addAll(a, /*clo.walk()*/hp);
+                    bag0.addAll(a, hp);
                 }
 
                 // Step 1b: for each _minimal, contiguous_ set of characters having an identical next-position
@@ -346,4 +337,19 @@ public abstract class Parser<T extends Token, R> {
     }
 
     private static final Forest[] emptyForestArray = new Forest[0];
+
+
+    // Helpers //////////////////////////////////////////////////////////////////////////////
+
+    private static void reachable(Element e, HashSet<Position> h) {
+        if (e instanceof Atom) return;
+        for(Sequence s : ((Union)e))
+            reachable(s.firstp(), h);
+    }
+    private static void reachable(Position p, HashSet<Position> h) {
+        if (h.contains(p)) return;
+        h.add(p);
+        if (p.element() != null) reachable(p.element(), h);
+    }
+
 }