Menu
▾
▴
[Rubyeclipse-commit] SF.net SVN: rubyeclipse: [2618] trunk/com.aptana.rdt
|
From: <caw...@us...> - 2007-06-14 19:18:48
|
Revision: 2618
http://svn.sourceforge.net/rubyeclipse/?rev=2618&view=rev
Author: cawilliams
Date: 2007-06-14 12:18:46 -0700 (Thu, 14 Jun 2007)
Log Message:
-----------
renamed old CodeComplexityVisitor to TooManyLocalsVisitor since it's been split/gutted out to only do that now
Modified Paths:
--------------
trunk/com.aptana.rdt/src/com/aptana/rdt/internal/parser/warnings/RubyRedLint.java
trunk/com.aptana.rdt.tests/src/com/aptana/rdt/internal/core/parser/warnings/TC_CodeComplexity.java
Added Paths:
-----------
trunk/com.aptana.rdt/src/com/aptana/rdt/internal/parser/warnings/TooManyLocalsVisitor.java
Removed Paths:
-------------
trunk/com.aptana.rdt/src/com/aptana/rdt/internal/parser/warnings/CodeComplexityVisitor.java
Deleted: trunk/com.aptana.rdt/src/com/aptana/rdt/internal/parser/warnings/CodeComplexityVisitor.java
===================================================================
--- trunk/com.aptana.rdt/src/com/aptana/rdt/internal/parser/warnings/CodeComplexityVisitor.java 2007-06-14 19:16:55 UTC (rev 2617)
+++ trunk/com.aptana.rdt/src/com/aptana/rdt/internal/parser/warnings/CodeComplexityVisitor.java 2007-06-14 19:18:46 UTC (rev 2618)
@@ -1,77 +0,0 @@
-package com.aptana.rdt.internal.parser.warnings;
-
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-
-import org.jruby.ast.DefnNode;
-import org.jruby.ast.DefsNode;
-import org.jruby.ast.LocalAsgnNode;
-import org.jruby.evaluator.Instruction;
-import org.rubypeople.rdt.internal.core.parser.warnings.RubyLintVisitor;
-
-import com.aptana.rdt.AptanaRDTPlugin;
-
-public class CodeComplexityVisitor extends RubyLintVisitor {
-
-
- private int maxLocals;
- private Set locals;
- private Map fOptions;
-
- public CodeComplexityVisitor(String contents) {
- this(AptanaRDTPlugin.getDefault().getOptions(), contents);
- }
-
- public CodeComplexityVisitor(Map options, String contents) {
- super(contents);
- fOptions = options;
- maxLocals = getInt(AptanaRDTPlugin.COMPILER_PB_MAX_LOCALS, 4);
- }
- private int getInt(String key, int defaultValue) {
- try {
- return Integer.parseInt((String) fOptions.get(key));
- } catch (NumberFormatException e) {
- return defaultValue;
- }
- }
-
- @Override
- protected String getOptionKey() {
- return AptanaRDTPlugin.COMPILER_PB_MAX_LOCALS;
- }
-
- @Override
- public Instruction visitDefsNode(DefsNode iVisited) {
- locals = new HashSet();
- return super.visitDefsNode(iVisited);
- }
-
- @Override
- public Instruction visitDefnNode(DefnNode iVisited) {
- locals = new HashSet();
- return super.visitDefnNode(iVisited);
- }
-
- @Override
- public Instruction visitLocalAsgnNode(LocalAsgnNode iVisited) {
- locals.add(iVisited.getName());
- return super.visitLocalAsgnNode(iVisited);
- }
-
- public void exitDefnNode(DefnNode iVisited) {
- if (locals.size() > maxLocals) {
- createProblem(iVisited.getNameNode().getPosition(), "Too many local variables: " + locals.size());
- }
- locals.clear();
- }
-
- @Override
- public void exitDefsNode(DefsNode iVisited) {
- if (locals.size() > maxLocals) {
- createProblem(iVisited.getNameNode().getPosition(), "Too many local variables: " + locals.size());
- }
- locals.clear();
- super.exitDefsNode(iVisited);
- }
-}
Modified: trunk/com.aptana.rdt/src/com/aptana/rdt/internal/parser/warnings/RubyRedLint.java
===================================================================
--- trunk/com.aptana.rdt/src/com/aptana/rdt/internal/parser/warnings/RubyRedLint.java 2007-06-14 19:16:55 UTC (rev 2617)
+++ trunk/com.aptana.rdt/src/com/aptana/rdt/internal/parser/warnings/RubyRedLint.java 2007-06-14 19:18:46 UTC (rev 2618)
@@ -72,7 +72,7 @@
visitors.add(new LocalsMaskingMethodsVisitor(contents));
visitors.add(new UnusedParameterVisitor(contents));
visitors.add(new UnecessaryElseVisitor(contents));
- visitors.add(new CodeComplexityVisitor(contents));
+ visitors.add(new TooManyLocalsVisitor(contents));
visitors.add(new TooManyLinesVisitor(contents));
visitors.add(new TooManyBranchesVisitor(contents));
visitors.add(new TooManyArgumentsVisitor(contents));
Copied: trunk/com.aptana.rdt/src/com/aptana/rdt/internal/parser/warnings/TooManyLocalsVisitor.java (from rev 2617, trunk/com.aptana.rdt/src/com/aptana/rdt/internal/parser/warnings/CodeComplexityVisitor.java)
===================================================================
--- trunk/com.aptana.rdt/src/com/aptana/rdt/internal/parser/warnings/TooManyLocalsVisitor.java (rev 0)
+++ trunk/com.aptana.rdt/src/com/aptana/rdt/internal/parser/warnings/TooManyLocalsVisitor.java 2007-06-14 19:18:46 UTC (rev 2618)
@@ -0,0 +1,77 @@
+package com.aptana.rdt.internal.parser.warnings;
+
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+import org.jruby.ast.DefnNode;
+import org.jruby.ast.DefsNode;
+import org.jruby.ast.LocalAsgnNode;
+import org.jruby.evaluator.Instruction;
+import org.rubypeople.rdt.internal.core.parser.warnings.RubyLintVisitor;
+
+import com.aptana.rdt.AptanaRDTPlugin;
+
+public class TooManyLocalsVisitor extends RubyLintVisitor {
+
+
+ private int maxLocals;
+ private Set locals;
+ private Map fOptions;
+
+ public TooManyLocalsVisitor(String contents) {
+ this(AptanaRDTPlugin.getDefault().getOptions(), contents);
+ }
+
+ public TooManyLocalsVisitor(Map options, String contents) {
+ super(contents);
+ fOptions = options;
+ maxLocals = getInt(AptanaRDTPlugin.COMPILER_PB_MAX_LOCALS, 4);
+ }
+ private int getInt(String key, int defaultValue) {
+ try {
+ return Integer.parseInt((String) fOptions.get(key));
+ } catch (NumberFormatException e) {
+ return defaultValue;
+ }
+ }
+
+ @Override
+ protected String getOptionKey() {
+ return AptanaRDTPlugin.COMPILER_PB_MAX_LOCALS;
+ }
+
+ @Override
+ public Instruction visitDefsNode(DefsNode iVisited) {
+ locals = new HashSet();
+ return super.visitDefsNode(iVisited);
+ }
+
+ @Override
+ public Instruction visitDefnNode(DefnNode iVisited) {
+ locals = new HashSet();
+ return super.visitDefnNode(iVisited);
+ }
+
+ @Override
+ public Instruction visitLocalAsgnNode(LocalAsgnNode iVisited) {
+ locals.add(iVisited.getName());
+ return super.visitLocalAsgnNode(iVisited);
+ }
+
+ public void exitDefnNode(DefnNode iVisited) {
+ if (locals.size() > maxLocals) {
+ createProblem(iVisited.getNameNode().getPosition(), "Too many local variables: " + locals.size());
+ }
+ locals.clear();
+ }
+
+ @Override
+ public void exitDefsNode(DefsNode iVisited) {
+ if (locals.size() > maxLocals) {
+ createProblem(iVisited.getNameNode().getPosition(), "Too many local variables: " + locals.size());
+ }
+ locals.clear();
+ super.exitDefsNode(iVisited);
+ }
+}
Modified: trunk/com.aptana.rdt.tests/src/com/aptana/rdt/internal/core/parser/warnings/TC_CodeComplexity.java
===================================================================
--- trunk/com.aptana.rdt.tests/src/com/aptana/rdt/internal/core/parser/warnings/TC_CodeComplexity.java 2007-06-14 19:16:55 UTC (rev 2617)
+++ trunk/com.aptana.rdt.tests/src/com/aptana/rdt/internal/core/parser/warnings/TC_CodeComplexity.java 2007-06-14 19:18:46 UTC (rev 2618)
@@ -2,7 +2,7 @@
import org.rubypeople.rdt.internal.core.parser.warnings.RubyLintVisitor;
-import com.aptana.rdt.internal.parser.warnings.CodeComplexityVisitor;
+import com.aptana.rdt.internal.parser.warnings.TooManyLocalsVisitor;
public class TC_CodeComplexity extends WarningVisitorTest {
@@ -11,7 +11,7 @@
@Override
protected RubyLintVisitor createVisitor(String code) {
- return new CodeComplexityVisitor(code);
+ return new TooManyLocalsVisitor(code);
}
// TODO Add tests for max branches
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
