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

tweaks per Sam's comments. Just pushing straight to master.

This commit is contained in:
Terence Parr 2014-06-10 11:28:43 -07:00
parent d94ce39d09
commit 358a1025d2
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
runtime/Java/src/org/antlr/v4/runtime/atn/ProfilingATNSimulator.java
View File

@ -59,7 +59,7 @@ public class ProfilingATNSimulator extends ParserATNSimulator {
* an ambiguity, it is not treated as a context sensitivity because LL prediction
* was not required in order to produce a correct prediction for this decision and input sequence.
* It may in fact still be a context sensitivity but we don't know by looking at the
* minimum alternatives.
* minimum alternatives for the current input.
*/
protected int conflictingAltResolvedBySLL;
@ -211,9 +211,17 @@ public class ProfilingATNSimulator extends ParserATNSimulator {
}
@Override
protected void reportAmbiguity(@NotNull DFA dfa, DFAState D, int startIndex, int stopIndex, boolean exact, @Nullable BitSet ambigAlts, @NotNull ATNConfigSet configs) {
int prediction = configs.getAlts().nextSetBit(0);
if ( prediction != conflictingAltResolvedBySLL ) {
protected void reportAmbiguity(@NotNull DFA dfa, DFAState D, int startIndex, int stopIndex, boolean exact,
@Nullable BitSet ambigAlts, @NotNull ATNConfigSet configs)
{
int prediction;
if ( ambigAlts!=null ) {
prediction = ambigAlts.nextSetBit(0);
}
else {
prediction = configs.getAlts().nextSetBit(0);
}
if ( configs.fullCtx && prediction != conflictingAltResolvedBySLL ) {
// Even though this is an ambiguity we are reporting, we can
// still detect some context sensitivities. Both SLL and LL
// are showing a conflict, hence an ambiguity, but if they resolve

4
tool/resources/org/antlr/v4/tool/templates/codegen/Java/Java.stg
View File

@ -213,7 +213,7 @@ Parser(parser, funcs, atn, sempredFuncs, superClass) ::= <<
Parser_(parser, funcs, atn, sempredFuncs, ctor, superClass) ::= <<
@SuppressWarnings({"all", "warnings", "unchecked", "unused", "cast"})
public class <parser.name> extends <if(superClass)><superClass><else>Parser<endif> {
public class <parser.name> extends <superClass; null="Parser"> {
static { RuntimeMetaData.checkVersion("<file.ANTLRVersion>", RuntimeMetaData.VERSION); }
protected static final DFA[] _decisionToDFA;
@ -812,7 +812,7 @@ import org.antlr.v4.runtime.misc.*;
Lexer(lexer, atn, actionFuncs, sempredFuncs, superClass) ::= <<
@SuppressWarnings({"all", "warnings", "unchecked", "unused", "cast"})
public class <lexer.name> extends <if(superClass)><superClass><else>Lexer<endif> {
public class <lexer.name> extends <superClass; null="Lexer"> {
static { RuntimeMetaData.checkVersion("<lexerFile.ANTLRVersion>", RuntimeMetaData.VERSION); }
protected static final DFA[] _decisionToDFA;