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

Merge pull request #811 from antlr/fix-809 

Fix 809
This commit is contained in:
Terence Parr 2015-01-31 14:48:10 -08:00
parent e8c6dc4e39 822d61ad47
commit 66e275d164
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
runtime/Java/src/org/antlr/v4/runtime/Parser.java
View File

@ -36,13 +36,12 @@ import org.antlr.v4.runtime.atn.ATNSimulator;
import org.antlr.v4.runtime.atn.ATNState; import org.antlr.v4.runtime.atn.ATNState;
import org.antlr.v4.runtime.atn.ParseInfo; import org.antlr.v4.runtime.atn.ParseInfo;
import org.antlr.v4.runtime.atn.ParserATNSimulator; import org.antlr.v4.runtime.atn.ParserATNSimulator;
import org.antlr.v4.runtime.atn.PredictionMode;
import org.antlr.v4.runtime.atn.ProfilingATNSimulator; import org.antlr.v4.runtime.atn.ProfilingATNSimulator;
import org.antlr.v4.runtime.atn.RuleTransition; import org.antlr.v4.runtime.atn.RuleTransition;
import org.antlr.v4.runtime.dfa.DFA; import org.antlr.v4.runtime.dfa.DFA;
import org.antlr.v4.runtime.misc.IntegerStack; import org.antlr.v4.runtime.misc.IntegerStack;
import org.antlr.v4.runtime.misc.IntervalSet; import org.antlr.v4.runtime.misc.IntervalSet;
import org.antlr.v4.runtime.misc.NotNull;
import org.antlr.v4.runtime.misc.Nullable;
import org.antlr.v4.runtime.tree.ErrorNode; import org.antlr.v4.runtime.tree.ErrorNode;
import org.antlr.v4.runtime.tree.ParseTreeListener; import org.antlr.v4.runtime.tree.ParseTreeListener;
import org.antlr.v4.runtime.tree.ParseTreeWalker; import org.antlr.v4.runtime.tree.ParseTreeWalker;
@ -893,14 +892,18 @@ public abstract class Parser extends Recognizer<Token, ParserATNSimulator> {
*/ */
public void setProfile(boolean profile) { public void setProfile(boolean profile) {
ParserATNSimulator interp = getInterpreter(); ParserATNSimulator interp = getInterpreter();
PredictionMode saveMode = interp.getPredictionMode();
if ( profile ) { if ( profile ) {
if (!(interp instanceof ProfilingATNSimulator)) { if ( !(interp instanceof ProfilingATNSimulator) ) {
setInterpreter(new ProfilingATNSimulator(this)); setInterpreter(new ProfilingATNSimulator(this));
} }
} }
else if (interp instanceof ProfilingATNSimulator) { else if ( interp instanceof ProfilingATNSimulator ) {
setInterpreter(new ParserATNSimulator(this, getATN(), interp.decisionToDFA, interp.getSharedContextCache())); ParserATNSimulator sim =
new ParserATNSimulator(this, getATN(), interp.decisionToDFA, interp.getSharedContextCache());
setInterpreter(sim);
} }
getInterpreter().setPredictionMode(saveMode);
} }
/** During a parse is sometimes useful to listen in on the rule entry and exit /** During a parse is sometimes useful to listen in on the rule entry and exit

1
tool/tool.iml
View File

@ -17,6 +17,7 @@
<sourceFolder url="file://$MODULE_DIR$/../gen3" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/../gen3" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/../antlr4-maven-plugin/resources" type="java-resource" /> <sourceFolder url="file://$MODULE_DIR$/../antlr4-maven-plugin/resources" type="java-resource" />
<excludeFolder url="file://$MODULE_DIR$/../.idea" /> <excludeFolder url="file://$MODULE_DIR$/../.idea" />
<excludeFolder url="file://$MODULE_DIR$/../antlr4-maven-plugin" />
<excludeFolder url="file://$MODULE_DIR$/../build" /> <excludeFolder url="file://$MODULE_DIR$/../build" />
<excludeFolder url="file://$MODULE_DIR$/../runtime" /> <excludeFolder url="file://$MODULE_DIR$/../runtime" />
</content> </content>