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

Restrict lexer action execution to actions defined in the root lexer rule that matches a token

This commit is contained in:
Sam Harwell 2014-01-18 16:06:12 -06:00
parent 9b85e9c636
commit 214b715107
1 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
runtime/Java/src/org/antlr/v4/runtime/atn/LexerATNSimulator.java
View File

@ -524,9 +524,28 @@ public class LexerATNSimulator extends ATNSimulator {
break;
case Transition.ACTION:
LexerActionExecutor lexerActionExecutor = LexerActionExecutor.append(config.lexerActionExecutor, atn.lexerActions[((ActionTransition)t).actionIndex]);
c = new LexerATNConfig(config, t.target, lexerActionExecutor);
break;
if (config.context == null || config.context.hasEmptyPath()) {
// execute actions anywhere in the start rule for a token.
//
// TODO: if the entry rule is invoked recursively, some
// actions may be executed during the recursive call. The
// problem can appear when hasEmptyPath() is true but
// isEmpty() is false. In this case, the config needs to be
// split into two contexts - one with just the empty path
// and another with everything but the empty path.
// Unfortunately, the current algorithm does not allow
// getEpsilonTarget to return two configurations, so
// additional modifications are needed before we can support
// the split operation.
LexerActionExecutor lexerActionExecutor = LexerActionExecutor.append(config.lexerActionExecutor, atn.lexerActions[((ActionTransition)t).actionIndex]);
c = new LexerATNConfig(config, t.target, lexerActionExecutor);
break;
}
else {
// ignore actions in referenced rules
c = new LexerATNConfig(config, t.target);
break;
}
case Transition.EPSILON:
c = new LexerATNConfig(config, t.target);