projects
/
sbp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
checkpoint
[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
60da9e4
..
31bd1b3
100644
(file)
--- a/
src/edu/berkeley/sbp/Parser.java
+++ b/
src/edu/berkeley/sbp/Parser.java
@@
-15,14
+15,14
@@
public abstract class Parser<Tok, Result> {
protected Parser(Table<Tok> pt) { this.pt = pt; }
/** implement this method to create the output forest corresponding to a lone shifted input token */
protected Parser(Table<Tok> pt) { this.pt = pt; }
/** implement this method to create the output forest corresponding to a lone shifted input token */
- public abstract Forest<Result> shiftToken(Tok t, Token.Location loc);
+ public abstract Forest<Result> shiftToken(Tok t, Input.Location loc);
/** parse <tt>input</tt>, using the table <tt>pt</tt> to drive the parser */
/** parse <tt>input</tt>, using the table <tt>pt</tt> to drive the parser */
- public Forest<Result> parse(Token.Stream<Tok> input) throws IOException, ParseFailed {
+ public Forest<Result> parse(Input<Tok> input) throws IOException, ParseFailed {
GSS gss = new GSS();
GSS gss = new GSS();
- Token.Location loc = input.getLocation();
+ Input.Location loc = input.getLocation();
GSS.Phase current = gss.new Phase<Tok>(null, this, null, input.next(1, 0, 0), loc, null);
GSS.Phase current = gss.new Phase<Tok>(null, this, null, input.next(1, 0, 0), loc, null);
- current.newNode(null, Forest.leaf(null, null), pt.start, true);
+ current.newNode(null, Forest.leaf(null, null, null), pt.start, true);
int count = 1;
for(;;) {
loc = input.getLocation();
int count = 1;
for(;;) {
loc = input.getLocation();
@@
-38,17
+38,10
@@
public abstract class Parser<Tok, Result> {
// Table //////////////////////////////////////////////////////////////////////////////
/** an SLR(1) parse table which may contain conflicts */
// Table //////////////////////////////////////////////////////////////////////////////
/** an SLR(1) parse table which may contain conflicts */
- public static class Table<Tok> extends Walk.Cache {
+ static class Table<Tok> extends Walk.Cache {
public final Walk.Cache cache = this;
public final Walk.Cache cache = this;
- public void optimize(Functor<Tok,Integer> f) {
- for(State<Tok> state : all_states.values()) {
- state.oreductions = state.reductions.optimize(f);
- state.oshifts = state.shifts.optimize(f);
- }
- }
-
private void walk(Element e, HashSet<Element> hs) {
if (e==null) return;
if (hs.contains(e)) return;
private void walk(Element e, HashSet<Element> hs) {
if (e==null) return;
if (hs.contains(e)) return;
@@
-73,7
+66,7
@@
public abstract class Parser<Tok, Result> {
public Table(String startSymbol, Topology top) { this(new Union(startSymbol), top); }
public Table(Union ux, Topology top) {
Union start0 = new Union("0");
public Table(String startSymbol, Topology top) { this(new Union(startSymbol), top); }
public Table(Union ux, Topology top) {
Union start0 = new Union("0");
- start0.add(new Sequence.Singleton(ux, null, null));
+ start0.add(new Sequence.Singleton(ux));
for(Sequence s : start0) cache.eof.put(s, true);
cache.eof.put(start0, true);
for(Sequence s : start0) cache.eof.put(s, true);
cache.eof.put(start0, true);
@@
-109,17
+102,22
@@
public abstract class Parser<Tok, Result> {
if (p.element() != null && p.element() instanceof Atom)
state.shifts.addAll(state.gotoSetTerminals.subset(((Atom)p.element())));
}
if (p.element() != null && p.element() instanceof Atom)
state.shifts.addAll(state.gotoSetTerminals.subset(((Atom)p.element())));
}
+ if (top instanceof IntegerTopology)
+ for(State<Tok> state : all_states.values()) {
+ state.oreductions = state.reductions.optimize(((IntegerTopology)top).functor());
+ state.oshifts = state.shifts.optimize(((IntegerTopology)top).functor());
+ }
}
private boolean isRightNullable(Position p) {
if (p.isLast()) return true;
}
private boolean isRightNullable(Position p) {
if (p.isLast()) return true;
- if (!p.element().possiblyEpsilon(this)) return false;
+ if (!possiblyEpsilon(p.element())) return false;
return isRightNullable(p.next());
}
/** a single state in the LR table and the transitions possible from it */
return isRightNullable(p.next());
}
/** a single state in the LR table and the transitions possible from it */
- public class State<Tok> implements Comparable<State<Tok>>, IntegerMappable, Iterable<Position> {
+ class State<Tok> implements Comparable<State<Tok>>, IntegerMappable, Iterable<Position> {
public final int idx = master_state_idx++;
private final HashSet<Position> hs;
public final int idx = master_state_idx++;
private final HashSet<Position> hs;