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
commit 2e59dc2184
1 changed files with 3 additions and 2 deletions

View File

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