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

Merge pull request #2302 from ericvergnaud/python-3-fix-2301 

Fixes #2301
This commit is contained in:
Terence Parr 2018-07-24 12:56:46 -07:00 committed by GitHub
parent 4f75699eeb d134b6a12d
commit c9df334af8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 37 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
runtime-testsuite/test/org/antlr/v4/test/runtime/descriptors/ParserExecDescriptors.java
View File

@ -854,4 +854,39 @@ public class ParserExecDescriptors {
@CommentHasStringValue
public String grammar;
}
/**
* This is a regression test for antlr/antlr4#2301.
*/
public static class OrderingPredicates extends BaseParserTestDescriptor {
public String input = "POINT AT X";
public String output = null;
public String errors = null;
public String startRule = "expr";
public String grammarName = "Issue2301";
/**
grammar Issue2301;
SPACES: [ \t\r\n]+ -> skip;
AT: 'AT';
X : 'X';
Y : 'Y';
ID: [A-Z]+;
constant
: 'DUMMY'
;
expr
: ID constant?
| expr AT X
| expr AT Y
;
*/
@CommentHasStringValue
public String grammar;
}
}

4
runtime/Python3/src/antlr4/atn/SemanticContext.py
View File

@ -135,8 +135,8 @@ class PrecedencePredicate(SemanticContext):
else:
return None
def __cmp__(self, other):
return self.precedence - other.precedence
def __lt__(self, other):
return self.precedence < other.precedence
def __hash__(self):
return 31