projects
/
sbp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
hoisted getLocation() out of Token and into Token.Stream
[sbp.git]
/
src
/
edu
/
berkeley
/
sbp
/
Parser.java
diff --git
a/src/edu/berkeley/sbp/Parser.java
b/src/edu/berkeley/sbp/Parser.java
index
e707eac
..
e8e0dc8
100644
(file)
--- 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> */
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;
private final Table pt;
@@
-24,16
+24,15
@@
public class Parser<T extends Token, R> {
if (p.element() != null) reachable(p.element(), h);
}
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>
/**
* 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, Token.Location loc);
+ 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(); }
/** 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(); }
@@
-41,12
+40,15
@@
public 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();
/** 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(;;) {
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();
current.reduce();
- current.shift(next);
+ 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();
current = next;
if (current.isDone()) return (Forest<R>)current.finalResult;
current.checkFailure();
current = next;
@@
-62,7
+64,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 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 {
}
public static class Ambiguous extends RuntimeException {
@@
-80,12
+82,13
@@
public class Parser<T extends Token, R> {
// Table //////////////////////////////////////////////////////////////////////////////
// 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;
/** 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();
public final Walk.Cache cache = new Walk.Cache();
@@
-155,7
+158,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)) {
// 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);
Reduction red = new Reduction(p);
state.reductions.put(wf.walk(p.owner()), red);
if (wf.includesEof()) state.eofReductions.add(red, true);
@@
-164,7
+167,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)
// 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
+238,7
@@
public class Parser<T extends Token, R> {
Atom a = (Atom)position.element();
HashSet<Position> hp = new HashSet<Position>();
reachable(position.next(), hp);
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
}
// Step 1b: for each _minimal, contiguous_ set of characters having an identical next-position