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

Remove unnecessary initializations, use isEmpty() instead of size()==0

This commit is contained in:
Sam Harwell 2012-02-09 12:45:46 -06:00
parent b686efb293
commit bf5df30708
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
runtime/Java/src/org/antlr/v4/runtime/atn/ParserATNSimulator.java
View File

@ -367,7 +367,7 @@ public class ParserATNSimulator<Symbol> extends ATNSimulator {
// if no edge, pop over to ATN interpreter, update DFA and return // if no edge, pop over to ATN interpreter, update DFA and return
if ( s.edges == null || t >= s.edges.length || t < -1 || s.edges[t+1] == null ) { if ( s.edges == null || t >= s.edges.length || t < -1 || s.edges[t+1] == null ) {
if ( dfa_debug && t>=0 ) System.out.println("no edge for "+parser.getTokenNames()[t]); if ( dfa_debug && t>=0 ) System.out.println("no edge for "+parser.getTokenNames()[t]);
int alt = -1; int alt;
if ( dfa_debug ) { if ( dfa_debug ) {
System.out.println("ATN exec upon "+ System.out.println("ATN exec upon "+
parser.getInputString(startIndex) + parser.getInputString(startIndex) +
@ -480,8 +480,8 @@ public class ParserATNSimulator<Symbol> extends ATNSimulator {
ATN_failover++; ATN_failover++;
ATNConfigSet previous = s0.configset; ATNConfigSet previous = s0.configset;
DFAState D = null; DFAState D;
ATNConfigSet fullCtxSet = null; ATNConfigSet fullCtxSet;
if ( debug ) System.out.println("s0 = "+s0); if ( debug ) System.out.println("s0 = "+s0);
@ -631,7 +631,7 @@ public class ParserATNSimulator<Symbol> extends ATNSimulator {
if ( reach.hasSemanticContext ) { if ( reach.hasSemanticContext ) {
SemanticContext[] altToPred = getPredsForAmbigAlts(reach.conflictingAlts, reach, nalts); SemanticContext[] altToPred = getPredsForAmbigAlts(reach.conflictingAlts, reach, nalts);
// altToPred[uniqueAlt] is now our validating predicate (if any) // altToPred[uniqueAlt] is now our validating predicate (if any)
List<DFAState.PredPrediction> predPredictions = null; List<DFAState.PredPrediction> predPredictions;
if ( altToPred!=null ) { if ( altToPred!=null ) {
// we have a validating predicate; test it // we have a validating predicate; test it
predPredictions = getPredicatePredictions(reach.conflictingAlts, altToPred); predPredictions = getPredicatePredictions(reach.conflictingAlts, altToPred);
@ -793,7 +793,7 @@ public class ParserATNSimulator<Symbol> extends ATNSimulator {
pairs.add(new DFAState.PredPrediction(pred, i)); pairs.add(new DFAState.PredPrediction(pred, i));
} }
} }
if ( pairs.size()==0 ) pairs = null; if ( pairs.isEmpty() ) pairs = null;
else if ( firstUnpredicated!=ATN.INVALID_ALT_NUMBER ) { else if ( firstUnpredicated!=ATN.INVALID_ALT_NUMBER ) {
// add default prediction if we found null predicate // add default prediction if we found null predicate
pairs.add(new DFAState.PredPrediction(null, firstUnpredicated)); pairs.add(new DFAState.PredPrediction(null, firstUnpredicated));