From 3b9940b02a6467c42da134cb5f69e25883f99004 Mon Sep 17 00:00:00 2001 From: Sam Harwell Date: Wed, 18 Jul 2012 12:20:33 -0500 Subject: [PATCH] Use isEmpty() instead of comparing size() with 0 --- runtime/Java/src/org/antlr/v4/runtime/atn/ATN.java | 2 +- runtime/Java/src/org/antlr/v4/runtime/tree/TraceTree.java | 2 +- tool/src/org/antlr/v4/analysis/AnalysisPipeline.java | 2 +- tool/src/org/antlr/v4/analysis/LeftRecursionDetector.java | 2 +- tool/src/org/antlr/v4/automata/ATNPrinter.java | 2 +- tool/src/org/antlr/v4/codegen/OutputModelController.java | 4 ++-- tool/src/org/antlr/v4/codegen/model/RuleFunction.java | 2 +- tool/src/org/antlr/v4/codegen/model/decl/StructDecl.java | 2 +- tool/src/org/antlr/v4/parse/ToolANTLRParser.java | 2 +- tool/src/org/antlr/v4/semantics/RuleCollector.java | 2 +- tool/src/org/antlr/v4/tool/DOTGenerator.java | 2 +- tool/src/org/antlr/v4/tool/ErrorManager.java | 2 +- tool/src/org/antlr/v4/tool/LeftRecursiveRule.java | 4 ++-- tool/src/org/antlr/v4/tool/Rule.java | 6 +++--- tool/src/org/antlr/v4/tool/ast/GrammarAST.java | 2 +- tool/test/org/antlr/v4/test/BaseTest.java | 2 +- 16 files changed, 20 insertions(+), 20 deletions(-) diff --git a/runtime/Java/src/org/antlr/v4/runtime/atn/ATN.java b/runtime/Java/src/org/antlr/v4/runtime/atn/ATN.java index 279a50ef2..97dd1636e 100644 --- a/runtime/Java/src/org/antlr/v4/runtime/atn/ATN.java +++ b/runtime/Java/src/org/antlr/v4/runtime/atn/ATN.java @@ -119,7 +119,7 @@ public class ATN { } public DecisionState getDecisionState(int decision) { - if ( decisionToState.size()>0 ) { + if ( !decisionToState.isEmpty() ) { return decisionToState.get(decision); } return null; diff --git a/runtime/Java/src/org/antlr/v4/runtime/tree/TraceTree.java b/runtime/Java/src/org/antlr/v4/runtime/tree/TraceTree.java index 6d1deeb79..fd216a18e 100644 --- a/runtime/Java/src/org/antlr/v4/runtime/tree/TraceTree.java +++ b/runtime/Java/src/org/antlr/v4/runtime/tree/TraceTree.java @@ -87,7 +87,7 @@ public class TraceTree implements Tree { states.add(0, p.state); p = p.parent; } - if ( states.size()==0 ) return null; + if ( states.isEmpty() ) return null; return states; } diff --git a/tool/src/org/antlr/v4/analysis/AnalysisPipeline.java b/tool/src/org/antlr/v4/analysis/AnalysisPipeline.java index 46d20e67f..0a7d99bdd 100644 --- a/tool/src/org/antlr/v4/analysis/AnalysisPipeline.java +++ b/tool/src/org/antlr/v4/analysis/AnalysisPipeline.java @@ -49,7 +49,7 @@ public class AnalysisPipeline { // LEFT-RECURSION CHECK LeftRecursionDetector lr = new LeftRecursionDetector(g, g.atn); lr.check(); - if ( lr.listOfRecursiveCycles.size()>0 ) return; // bail out + if ( !lr.listOfRecursiveCycles.isEmpty() ) return; // bail out // BUILD DFA FOR EACH DECISION if ( !g.isLexer() ) processParser(); diff --git a/tool/src/org/antlr/v4/analysis/LeftRecursionDetector.java b/tool/src/org/antlr/v4/analysis/LeftRecursionDetector.java index 1a96d9898..15279595d 100644 --- a/tool/src/org/antlr/v4/analysis/LeftRecursionDetector.java +++ b/tool/src/org/antlr/v4/analysis/LeftRecursionDetector.java @@ -63,7 +63,7 @@ public class LeftRecursionDetector { check(g.getRule(start.ruleIndex), start, new HashSet()); } //System.out.println("cycles="+listOfRecursiveCycles); - if ( listOfRecursiveCycles.size()>0 ) { + if ( !listOfRecursiveCycles.isEmpty() ) { g.tool.errMgr.leftRecursionCycles(g.fileName, listOfRecursiveCycles); } } diff --git a/tool/src/org/antlr/v4/automata/ATNPrinter.java b/tool/src/org/antlr/v4/automata/ATNPrinter.java index 63d6f23c6..4d4eeba82 100644 --- a/tool/src/org/antlr/v4/automata/ATNPrinter.java +++ b/tool/src/org/antlr/v4/automata/ATNPrinter.java @@ -59,7 +59,7 @@ public class ATNPrinter { StringBuilder buf = new StringBuilder(); ATNState s = null; - while ( work.size()>0 ) { + while ( !work.isEmpty() ) { s = work.remove(0); if ( marked.contains(s) ) continue; int n = s.getNumberOfTransitions(); diff --git a/tool/src/org/antlr/v4/codegen/OutputModelController.java b/tool/src/org/antlr/v4/codegen/OutputModelController.java index d3aadfdf1..96d786787 100644 --- a/tool/src/org/antlr/v4/codegen/OutputModelController.java +++ b/tool/src/org/antlr/v4/codegen/OutputModelController.java @@ -426,14 +426,14 @@ public class OutputModelController { public void setRoot(OutputModelObject root) { this.root = root; } public RuleFunction getCurrentRuleFunction() { - if ( currentRule.size()>0 ) return currentRule.peek(); + if ( !currentRule.isEmpty() ) return currentRule.peek(); return null; } public void pushCurrentRule(RuleFunction r) { currentRule.push(r); } public RuleFunction popCurrentRule() { - if ( currentRule.size()>0 ) return currentRule.pop(); + if ( !currentRule.isEmpty() ) return currentRule.pop(); return null; } diff --git a/tool/src/org/antlr/v4/codegen/model/RuleFunction.java b/tool/src/org/antlr/v4/codegen/model/RuleFunction.java index ff31dbedd..a522cb02e 100644 --- a/tool/src/org/antlr/v4/codegen/model/RuleFunction.java +++ b/tool/src/org/antlr/v4/codegen/model/RuleFunction.java @@ -90,7 +90,7 @@ public class RuleFunction extends OutputModelObject { super(factory); this.name = r.name; this.rule = r; - if ( r.modifiers!=null && r.modifiers.size()>0 ) { + if ( r.modifiers!=null && !r.modifiers.isEmpty() ) { this.modifiers = new ArrayList(); for (GrammarAST t : r.modifiers) modifiers.add(t.getText()); } diff --git a/tool/src/org/antlr/v4/codegen/model/decl/StructDecl.java b/tool/src/org/antlr/v4/codegen/model/decl/StructDecl.java index 49ef47356..9933d4451 100644 --- a/tool/src/org/antlr/v4/codegen/model/decl/StructDecl.java +++ b/tool/src/org/antlr/v4/codegen/model/decl/StructDecl.java @@ -115,5 +115,5 @@ public class StructDecl extends Decl { extensionMembers.add(member); } - public boolean isEmpty() { return attrs.size()==0; } + public boolean isEmpty() { return attrs.isEmpty(); } } diff --git a/tool/src/org/antlr/v4/parse/ToolANTLRParser.java b/tool/src/org/antlr/v4/parse/ToolANTLRParser.java index 7b06a3db6..b039e29a1 100644 --- a/tool/src/org/antlr/v4/parse/ToolANTLRParser.java +++ b/tool/src/org/antlr/v4/parse/ToolANTLRParser.java @@ -49,7 +49,7 @@ public class ToolANTLRParser extends ANTLRParser { RecognitionException e) { String msg = getParserErrorMessage(this, e); - if ( paraphrases.size()>0 ) { + if ( !paraphrases.isEmpty() ) { String paraphrase = (String)paraphrases.peek(); msg = msg+" while "+paraphrase; } diff --git a/tool/src/org/antlr/v4/semantics/RuleCollector.java b/tool/src/org/antlr/v4/semantics/RuleCollector.java index b0d2c2bf5..3ce7baace 100644 --- a/tool/src/org/antlr/v4/semantics/RuleCollector.java +++ b/tool/src/org/antlr/v4/semantics/RuleCollector.java @@ -115,7 +115,7 @@ public class RuleCollector extends GrammarTreeVisitor { int numAlts = block.getChildCount(); Rule r = new Rule(g, ID.getText(), rule, numAlts); r.mode = currentModeName; - if ( modifiers.size()>0 ) r.modifiers = modifiers; + if ( !modifiers.isEmpty() ) r.modifiers = modifiers; rules.put(r.name, r); } } diff --git a/tool/src/org/antlr/v4/tool/DOTGenerator.java b/tool/src/org/antlr/v4/tool/DOTGenerator.java index fa55ace2f..c8d651563 100644 --- a/tool/src/org/antlr/v4/tool/DOTGenerator.java +++ b/tool/src/org/antlr/v4/tool/DOTGenerator.java @@ -187,7 +187,7 @@ public class DOTGenerator { List work = new LinkedList(); work.add(startState); - while ( work.size()>0 ) { + while ( !work.isEmpty() ) { ATNState s = work.get(0); if ( markedStates.contains(s) ) { work.remove(0); continue; } markedStates.add(s); diff --git a/tool/src/org/antlr/v4/tool/ErrorManager.java b/tool/src/org/antlr/v4/tool/ErrorManager.java index 2229ff1c4..2ee04cea4 100644 --- a/tool/src/org/antlr/v4/tool/ErrorManager.java +++ b/tool/src/org/antlr/v4/tool/ErrorManager.java @@ -274,7 +274,7 @@ public class ErrorManager { format = new STGroupFile(fileName, "UTF-8"); format.load(); - if ( initSTListener.errors.size()>0 ) { + if ( !initSTListener.errors.isEmpty() ) { rawError("ANTLR installation corrupted; can't load messages format file:\n"+ initSTListener.toString()); panic(); diff --git a/tool/src/org/antlr/v4/tool/LeftRecursiveRule.java b/tool/src/org/antlr/v4/tool/LeftRecursiveRule.java index 81c0fa44f..a92b66f09 100644 --- a/tool/src/org/antlr/v4/tool/LeftRecursiveRule.java +++ b/tool/src/org/antlr/v4/tool/LeftRecursiveRule.java @@ -78,7 +78,7 @@ public class LeftRecursiveRule extends Rule { LeftRecursiveRuleAltInfo altInfo = recOpAlts.getElement(i); if ( altInfo.altLabel==null ) alts.add(altInfo.originalAltAST); } - if ( alts.size()==0 ) return null; + if ( alts.isEmpty() ) return null; return alts; } @@ -104,7 +104,7 @@ public class LeftRecursiveRule extends Rule { altInfo.altLabel)); } } - if ( labels.size()==0 ) return null; + if ( labels.isEmpty() ) return null; return labels; } } diff --git a/tool/src/org/antlr/v4/tool/Rule.java b/tool/src/org/antlr/v4/tool/Rule.java index 0487fb39d..2bdc12f53 100644 --- a/tool/src/org/antlr/v4/tool/Rule.java +++ b/tool/src/org/antlr/v4/tool/Rule.java @@ -184,7 +184,7 @@ public class Rule implements AttributeResolver { for (int i=1; i<=numberOfAlts; i++) { refs.addAll(alt[i].labelDefs.keySet()); } - if ( refs.size()==0 ) return null; + if ( refs.isEmpty() ) return null; return refs; } @@ -219,7 +219,7 @@ public class Rule implements AttributeResolver { labels.add(new Triple(i,alt[i].ast,altLabel.getText())); } } - if ( labels.size()==0 ) return null; + if ( labels.isEmpty() ) return null; return labels; } @@ -229,7 +229,7 @@ public class Rule implements AttributeResolver { GrammarAST altLabel = alt[i].ast.altLabel; if ( altLabel==null ) alts.add(alt[i].ast); } - if ( alts.size()==0 ) return null; + if ( alts.isEmpty() ) return null; return alts; } diff --git a/tool/src/org/antlr/v4/tool/ast/GrammarAST.java b/tool/src/org/antlr/v4/tool/ast/GrammarAST.java index 707100067..6e6ee5e6e 100644 --- a/tool/src/org/antlr/v4/tool/ast/GrammarAST.java +++ b/tool/src/org/antlr/v4/tool/ast/GrammarAST.java @@ -100,7 +100,7 @@ public class GrammarAST extends CommonTree { List work = new LinkedList(); work.add(this); GrammarAST t; - while ( work.size()>0 ) { + while ( !work.isEmpty() ) { t = work.remove(0); if ( types.contains(t.getType()) ) nodes.add(t); if ( t.children!=null ) work.addAll((Collection)t.children); diff --git a/tool/test/org/antlr/v4/test/BaseTest.java b/tool/test/org/antlr/v4/test/BaseTest.java index ba11c4959..442212a1a 100644 --- a/tool/test/org/antlr/v4/test/BaseTest.java +++ b/tool/test/org/antlr/v4/test/BaseTest.java @@ -861,7 +861,7 @@ public abstract class BaseTest { foundMsg = m; } } - assertTrue("no error; "+expectedMessage.errorType+" expected", equeue.errors.size()>0); + assertTrue("no error; "+expectedMessage.errorType+" expected", !equeue.errors.isEmpty()); assertTrue("too many errors; "+equeue.errors, equeue.errors.size()<=1); assertNotNull("couldn't find expected error: "+expectedMessage.errorType, foundMsg); /*