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

Merge branch 'dev'

This commit is contained in:
Terence Parr 2012-02-01 16:02:21 -08:00
parent dfc3acb39a c94037def5
commit 5cec4721ab
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tool/src/org/antlr/v4/parse/ANTLRLexer.g
View File

@ -119,12 +119,7 @@ package org.antlr.v4.parse;
@members {
public Token prevToken;
@Override
public void emit(Token token) {
super.emit(token);
if ( token.getChannel()==Token.DEFAULT_CHANNEL ) prevToken = token;
}
public boolean isLexer = false;
}
// --------
@ -227,10 +222,10 @@ COMMENT
ARG_OR_CHARSET
options {k=1;}
: {prevToken.getType()!=RULE_REF}?=> LEXER_CHAR_SET {$type=LEXER_CHAR_SET;}
| {prevToken.getType()==RULE_REF}?=> ARG_ACTION {$type=ARG_ACTION;}
: {isLexer}?=> LEXER_CHAR_SET {$type=LEXER_CHAR_SET;}
| {!isLexer}?=> ARG_ACTION {$type=ARG_ACTION;}
;
fragment
LEXER_CHAR_SET
: '[' ('\\]'|'\\'|~('\\'|']'))* ']'
@ -412,7 +407,7 @@ TOKENS_SPEC : 'tokens' WSNLCHARS* '{' ;
IMPORT : 'import' ;
FRAGMENT : 'fragment' ;
LEXER : 'lexer' ;
LEXER : 'lexer' {isLexer=true;} ;
PARSER : 'parser' ;
GRAMMAR : 'grammar' ;
PROTECTED : 'protected' ;