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

add TODOs and fix a -1 to be a constant.

This commit is contained in:
Terence Parr 2013-02-23 14:03:20 -08:00
parent 18508e2209
commit b372d4d88d
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
runtime/Java/src/org/antlr/v4/runtime/atn/ParserATNSimulator.java
View File

@ -480,13 +480,14 @@ public class ParserATNSimulator extends ATNSimulator {
" at DFA state "+s.stateNumber); " at DFA state "+s.stateNumber);
} }
//TODO: recheck synchronization here. don't need if no sync
// recheck; another thread might have added edge // recheck; another thread might have added edge
if ( s.edges == null || t >= s.edges.length || t < -1 || s.edges[t+1] == null ) { if ( s.edges == null || t >= s.edges.length || t < -1 || s.edges[t+1] == null ) {
alt = execATN(dfa, s, input, startIndex, outerContext); alt = execATN(dfa, s, input, startIndex, outerContext);
// this adds edge even if next state is accept for // this adds edge even if next state is accept for
// same alt; e.g., s0-A->:s1=>2-B->:s2=>2 // same alt; e.g., s0-A->:s1=>2-B->:s2=>2
// TODO: This next stuff kills edge, but extra states remain. :( // TODO: This next stuff kills edge, but extra states remain. :(
if ( s.isAcceptState && alt!=-1 ) { if ( s.isAcceptState && alt!=ATN.INVALID_ALT_NUMBER ) {
DFAState d = s.edges[input.LA(1)+1]; DFAState d = s.edges[input.LA(1)+1];
if ( d.isAcceptState && d.prediction==s.prediction ) { if ( d.isAcceptState && d.prediction==s.prediction ) {
// we can carve it out. // we can carve it out.
@ -509,6 +510,7 @@ public class ParserATNSimulator extends ATNSimulator {
throw noViableAlt(input, outerContext, s.configs, startIndex); throw noViableAlt(input, outerContext, s.configs, startIndex);
} }
s = target; s = target;
//TODO: can't be acceptstate here; rm that part of test?
if (!s.requiresFullContext && !s.isAcceptState && t != IntStream.EOF) { if (!s.requiresFullContext && !s.isAcceptState && t != IntStream.EOF) {
input.consume(); input.consume();
t = input.LA(1); t = input.LA(1);