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

Merge pull request #1921 from alimg/py-input-mismatch-error 

Fix input mismatch errors not reported the same way as Java in Python
This commit is contained in:
Terence Parr 2017-06-25 09:05:41 -07:00 committed by GitHub
parent 77f3c767b7 4b21583e2b
commit ff13553a2b
4 changed files with 40 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
contributors.txt
View File

@ -148,3 +148,4 @@ YYYY/MM/DD, github id, Full name, email
2017/05/11, jimallman, Jim Allman, jim@ibang.com
2017/05/26, waf, Will Fuqua, wafuqua@gmail.com
2017/05/29, kosak, Corey Kosak, kosak@kosak.com
2017/06/25, alimg, Alim Gökkaya, alim.gokkaya@gmail.com

37
runtime-testsuite/test/org/antlr/v4/test/runtime/descriptors/ParserErrorsDescriptors.java
View File

@ -581,4 +581,41 @@ public class ParserErrorsDescriptors {
public String grammar;
}
public static class TokenMismatch3 extends BaseParserTestDescriptor {
public String input = "";
public String output = null;
public String errors = "line 1:0 mismatched input '<EOF>' expecting {'(', BOOLEAN_LITERAL, ID, '$'}\n";
public String startRule = "expression";
public String grammarName = "T";
/**
grammar T;
expression
: value
| expression op=AND expression
| expression op=OR expression
;
value
: BOOLEAN_LITERAL
| ID
| ID1
| '(' expression ')'
;
AND : '&&';
OR : '||';
BOOLEAN_LITERAL : 'true' | 'false';
ID : [a-z]+;
ID1 : '$';
WS : [ \t\r\n]+ -> skip ;
*/
@CommentHasStringValue
public String grammar;
}
}

2
runtime/Python2/src/antlr4/IntervalSet.py
View File

@ -193,7 +193,7 @@ class IntervalSet(object):
elif a==Token.EPSILON:
return u"<EPSILON>"
else:
if a<len(literalNames):
if a<len(literalNames) and literalNames[a] != u"<INVALID>":
return literalNames[a]
if a<len(symbolicNames):
return symbolicNames[a]

2
runtime/Python3/src/antlr4/IntervalSet.py
View File

@ -173,7 +173,7 @@ class IntervalSet(object):
elif a==Token.EPSILON:
return "<EPSILON>"
else:
if a<len(literalNames):
if a<len(literalNames) and literalNames[a] != "<INVALID>":
return literalNames[a]
if a<len(symbolicNames):
return symbolicNames[a]