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

got QID calling ID working 

[git-p4: depot-paths = "//depot/code/antlr4/main/": change = 6831]
This commit is contained in:
parrt 2010-05-01 13:10:49 -08:00
parent f3e6d4644d
commit f6f444db52
2 changed files with 38 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
runtime/Java/src/org/antlr/v4/runtime/nfa/NFA.java
View File

@ -174,9 +174,9 @@ workLoop:
do { // while more work
c = input.LA(1);
int i = 0;
boolean accepted = false;
processOneChar:
while ( i<closure.size() ) {
//for (int i=0; i<closure.size(); i++) {
System.out.println("input["+input.index()+"]=="+(char)c+" closure="+closure+", i="+i+", reach="+ reach);
ThreadState t = closure.get(i);
ip = t.addr;
@ -207,9 +207,13 @@ processOneChar:
}
break;
case Bytecode.WILDCARD :
if ( c!=Token.EOF ) addToClosure(reach, ip, alt, context);
if ( c!=Token.EOF ) {
addToClosure(reach, ip, alt, context);
}
break;
case Bytecode.ACCEPT :
if ( context != NFAStack.EMPTY ) break; // only do accept for outermost rule
accepted = true;
int tokenLastCharIndex = input.index() - 1;
int ttype = getShort(code, ip);
System.out.println("ACCEPT "+ ttype +" with last char position "+ tokenLastCharIndex);
@ -251,9 +255,16 @@ processOneChar:
}
i++;
}
// if reach is empty, we didn't match anything but might have accepted
if ( reach.size()>0 ) { // if we reached other states, consume and process them
input.consume();
}
else if ( !accepted) {
System.err.println("no match for char "+(char)c+" at "+input.index());
input.consume();
}
// else reach.size==0 && matched, don't consume: accepted and
// swap to avoid reallocating space
List<ThreadState> tmp = reach;
reach = closure;
@ -301,13 +312,14 @@ processOneChar:
int retaddr = ip+2;
addToClosure(closure, target, alt, new NFAStack(context, retaddr));
break;
case Bytecode.ACCEPT :
// accept is just a ret if we have a stack;
// i.e., don't stop; someone called us and we need to use their
// accept, not this one
case Bytecode.RET :
if ( context != NFAStack.EMPTY ) {
addToClosure(closure, context.returnAddr, alt, context.parent);
}
break;
case Bytecode.ACCEPT :
// if stack
}
}

21
tool/test/org/antlr/v4/test/TestNFABytecodeInterp.java
View File

@ -63,6 +63,27 @@ public class TestNFABytecodeInterp extends BaseTest {
checkMatches(g, "32", expecting);
}
@Test public void testCallNonFragment() throws Exception {
LexerGrammar g = new LexerGrammar(
"lexer grammar L;\n" +
"QID : ID ('.' ID)+ ;\n" +
"ID : 'a'..'z'+ ;\n" +
"WS : ' ' ;\n");
String expecting = "ID, EOF";
checkMatches(g, "z", expecting);
expecting = "ID, WS, QID, WS, ID, WS, QID, WS, ID, EOF";
checkMatches(g, "z a.b x c.d.e y", expecting);
}
@Test public void testRecursiveCall() throws Exception {
LexerGrammar g = new LexerGrammar(
"lexer grammar L;\n" + //TODO
"I : D+ ;\n" +
"fragment D : '0'..'9'+ ;\n");
String expecting = "I, EOF";
checkMatches(g, "32", expecting);
}
public void _template() throws Exception {
LexerGrammar g = new LexerGrammar(
"\n");