X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2FParser.java;h=a54fa08df2eb57ee147e1d210b402a8dae7957ea;hb=799bc0f3253172bd0cc3b54c90566825ac1a51c9;hp=e707eacd3f15916dba84ea30fcc2ae41d354aa09;hpb=84a4a8204373b996105e69edf91d2f9fae7b4bcb;p=sbp.git

diff --git a/src/edu/berkeley/sbp/Parser.java b/src/edu/berkeley/sbp/Parser.java
index e707eac..a54fa08 100644
--- a/src/edu/berkeley/sbp/Parser.java
+++ b/src/edu/berkeley/sbp/Parser.java
@@ -9,7 +9,7 @@ import java.util.*;
 import java.lang.reflect.*;
 
 /** a parser which translates streams of Tokens of type T into a Forest<R> */
-public class Parser<T extends Token, R> {
+public abstract class Parser<T extends Token, R> {
 
     private final Table pt;
 
@@ -24,16 +24,15 @@ public class Parser<T extends Token, R> {
         if (p.element() != null) reachable(p.element(), h);
     }
 
-    //public Parser(          Topology top) { this(new Table(   top)); }
-    //public Parser(String s, Topology top) { this(new Table(s, top)); }
-
     /**
      *  create a parser to parse the grammar with start symbol <tt>u</tt>
-     *  @param top a "sample" Topology<T> that can be cloned (FIXME, demanding this is lame)
      */
-    public Parser(Union u,  Topology<T> top) { this(new Table(u, top)); }
+    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 Topology<T> top();
 
-    Parser(Table pt)               { this.pt = pt; }
 
     /** parse <tt>input</tt> for a exactly one unique result, throwing <tt>Ambiguous</tt> if not unique or <tt>Failed</tt> if none */
     public Tree<R> parse1(Token.Stream<T> input) throws IOException, Failed, Ambiguous { return parse(input).expand1(); }
@@ -46,7 +45,8 @@ public class Parser<T extends Token, R> {
         for(;;) {
             GSS.Phase next = gss.new Phase(current, input.next());
             current.reduce();
-            current.shift(next);
+            Forest forest = current.token==null ? null : shiftedToken((T)current.token);
+            current.shift(next, forest);
             if (current.isDone()) return (Forest<R>)current.finalResult;
             current.checkFailure();
             current = next;
@@ -62,7 +62,7 @@ public 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 +80,13 @@ public 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 Sequence start0seq;
-        static class Top extends Union { public Top() { super("0"); } }
         
         public final Walk.Cache cache = new Walk.Cache();
         
@@ -155,7 +156,7 @@ public class Parser<T extends Token, R> {
                     // FIXME: how does right-nullability interact with follow restrictions?
                     // all right-nullable rules get a reduction [Johnstone 2000]
                     if (p.isRightNullable(cache)) {
-                        Walk.Follow wf = new Walk.Follow(top.fresh(), p.owner(), all_elements, cache);
+                        Walk.Follow wf = new Walk.Follow(top.empty(), p.owner(), all_elements, cache);
                         Reduction red = new Reduction(p);
                         state.reductions.put(wf.walk(p.owner()), red);
                         if (wf.includesEof()) state.eofReductions.add(red, true);
@@ -164,7 +165,7 @@ public class Parser<T extends Token, R> {
                     // if the element following this position is an atom, copy the corresponding
                     // set of rows out of the "master" goto table and into this state's shift table
                     if (p.element() != null && p.element() instanceof Atom)
-                        state.shifts.addAll(state.gotoSetTerminals.subset(((Atom)p.element()).dup()));
+                        state.shifts.addAll(state.gotoSetTerminals.subset(((Atom)p.element())));
                 }
         }
 
@@ -235,7 +236,7 @@ public class Parser<T extends Token, R> {
                     Atom a = (Atom)position.element();
                     HashSet<Position> hp = new HashSet<Position>();
                     reachable(position.next(), hp);
-                    bag0.addAll(a.dup(), /*clo.walk()*/hp);
+                    bag0.addAll(a, /*clo.walk()*/hp);
                 }
 
                 // Step 1b: for each _minimal, contiguous_ set of characters having an identical next-position