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

Merge pull request #1469 from gaulouis/issue-1461 

Fix conflict lexer command in CppTarget demo
This commit is contained in:
Terence Parr 2016-12-11 15:14:14 -08:00 committed by GitHub
parent 7cf5688760 2d3377c94e
commit 2e59dc2184
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
runtime/Cpp/demo/TLexer.g4
View File

@ -66,8 +66,9 @@ OpenCurly: '{' -> pushMode(Mode1);
CloseCurly: '}' -> popMode; CloseCurly: '}' -> popMode;
QuestionMark: '?'; QuestionMark: '?';
Comma: ',' -> skip; Comma: ',' -> skip;
Dollar: '$' -> more, mode(Mode1), type(DUMMY); Dollar: '$' -> more, mode(Mode1);
Ampersand: '&' -> type(DUMMY);
String: '"' .*? '"'; String: '"' .*? '"';
Foo: {canTestFoo()}? 'foo' {isItFoo()}? { myFooLexerAction(); }; Foo: {canTestFoo()}? 'foo' {isItFoo()}? { myFooLexerAction(); };
Bar: 'bar' {isItBar()}? { myBarLexerAction(); }; Bar: 'bar' {isItBar()}? { myBarLexerAction(); };