jasder
/
antlr
1
0
Fork 1
Code Issues Pull Requests Releases 1 Wiki Activity

dropped another eps edge; like 5% savings for JavaLR.g4 

[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 9543]
This commit is contained in:
parrt 2011-12-07 13:07:04 -08:00
parent 946c59da14
commit 6c5f3655b9
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tool/src/org/antlr/v4/automata/ParserATNFactory.java
View File

@ -63,6 +63,9 @@ public class ParserATNFactory implements ATNFactory {
public void visitState(ATNState p) { public void visitState(ATNState p) {
if ( p.getClass() == ATNState.class && p.getNumberOfTransitions()==1 ) { if ( p.getClass() == ATNState.class && p.getNumberOfTransitions()==1 ) {
ATNState q = p.transition(0).target; ATNState q = p.transition(0).target;
if ( p.transition(0) instanceof RuleTransition ) {
q = ((RuleTransition)p.transition(0)).followState;
}
if ( q.getClass() == ATNState.class ) { if ( q.getClass() == ATNState.class ) {
// we have p-x->q for x in {rule, action, pred, token, ...} // we have p-x->q for x in {rule, action, pred, token, ...}
// if edge out of q is single epsilon to block end // if edge out of q is single epsilon to block end
@ -74,7 +77,12 @@ public class ParserATNFactory implements ATNFactory {
r instanceof StarLoopbackState ) r instanceof StarLoopbackState )
{ {
// skip over q // skip over q
p.transition(0).target = r; if ( p.transition(0) instanceof RuleTransition ) {
((RuleTransition)p.transition(0)).followState = r;
}
else {
p.transition(0).target = r;
}
atn.removeState(q); atn.removeState(q);
} }
} }
@ -133,7 +141,7 @@ public class ParserATNFactory implements ATNFactory {
RuleStopState stop = atn.ruleToStopState[r.index]; RuleStopState stop = atn.ruleToStopState[r.index];
epsilon(blk.right, stop); epsilon(blk.right, stop);
Handle h = new Handle(start, stop); Handle h = new Handle(start, stop);
ATNPrinter ser = new ATNPrinter(g, h.left); // ATNPrinter ser = new ATNPrinter(g, h.left);
// System.out.println(ruleAST.toStringTree()+":\n"+ser.asString()); // System.out.println(ruleAST.toStringTree()+":\n"+ser.asString());
ruleAST.atnState = start; ruleAST.atnState = start;
return h; return h;