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

Fix codegen problem where notset and wildcard transitions could match invalid tokens and/or EOF

This commit is contained in:
Sam Harwell 2012-09-16 12:53:25 -05:00
parent aa2d893a77
commit e9656e35f9
3 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
runtime/Java/src/org/antlr/v4/runtime/Parser.java
View File

@ -142,7 +142,7 @@ public abstract class Parser extends Recognizer<Token, ParserATNSimulator<Token>
*/
public Token match(int ttype) throws RecognitionException {
Token t = getCurrentToken();
if ( getInputStream().LA(1)==ttype ) {
if ( t.getType()==ttype ) {
_errHandler.endErrorCondition(this);
consume();
}
@ -157,6 +157,24 @@ public abstract class Parser extends Recognizer<Token, ParserATNSimulator<Token>
return t;
}
public Token matchWildcard() throws RecognitionException {
Token t = getCurrentToken();
if (t.getType() > 0) {
_errHandler.endErrorCondition(this);
consume();
}
else {
t = _errHandler.recoverInline(this);
if (_buildParseTrees && t.getTokenIndex() == -1) {
// we must have conjured up a new token during single token insertion
// if it's not the current symbol
_ctx.addErrorNode(t);
}
}
return t;
}
/** Track the RuleContext objects during the parse and hook them up
* using the children list so that it forms a parse tree.
* The RuleContext returned from the start rule represents the root

4
tool/resources/org/antlr/v4/tool/templates/codegen/Java/Java.stg
View File

@ -450,7 +450,7 @@ CommonSetStuff(m, expr, capture, invert) ::= <<
setState(<m.stateNumber>);
<if(m.labels)><m.labels:{l | <labelref(l)> = }><endif>_input.LT(1);
<capture>
if ( <if(!invert)>!<endif>(<expr>) ) {
if ( <if(invert)><m.varName> \<= 0 || <else>!<endif>(<expr>) ) {
<if(m.labels)><m.labels:{l | <labelref(l)> = (Token)}><endif>_errHandler.recoverInline(this);
}
consume();
@ -458,7 +458,7 @@ consume();
Wildcard(w) ::= <<
setState(<w.stateNumber>);
<if(w.labels)><w.labels:{l | <labelref(l)> = }><endif>_input.LT(1); consume();
<if(w.labels)><w.labels:{l | <labelref(l)> = }><endif>matchWildcard();
>>
// ACTION STUFF

1
tool/src/org/antlr/v4/codegen/model/MatchNotSet.java
View File

@ -33,6 +33,7 @@ import org.antlr.v4.codegen.OutputModelFactory;
import org.antlr.v4.tool.ast.GrammarAST;
public class MatchNotSet extends MatchSet {
public String varName = "_la";
public MatchNotSet(OutputModelFactory factory, GrammarAST ast) {
super(factory, ast);
}