[Rubyeclipse-commit] SF.net SVN: rubyeclipse: [2624] trunk/com.aptana.rdt/src/com/aptana/rdt/ internal/parser/warnings/TooManyBranchesVisitor.java

[<caw...@us...>]

Revision: 2624
          http://svn.sourceforge.net/rubyeclipse/?rev=2624&view=rev
Author:   cawilliams
Date:     2007-06-18 13:07:36 -0700 (Mon, 18 Jun 2007)

Log Message:
-----------
handle case where getNextCase() on CaseNode returns something other than a WhenNode

Modified Paths:
--------------
    trunk/com.aptana.rdt/src/com/aptana/rdt/internal/parser/warnings/TooManyBranchesVisitor.java

Modified: trunk/com.aptana.rdt/src/com/aptana/rdt/internal/parser/warnings/TooManyBranchesVisitor.java
===================================================================
--- trunk/com.aptana.rdt/src/com/aptana/rdt/internal/parser/warnings/TooManyBranchesVisitor.java	2007-06-18 20:07:09 UTC (rev 2623)
+++ trunk/com.aptana.rdt/src/com/aptana/rdt/internal/parser/warnings/TooManyBranchesVisitor.java	2007-06-18 20:07:36 UTC (rev 2624)
@@ -6,6 +6,8 @@
 import org.jruby.ast.DefnNode;
 import org.jruby.ast.DefsNode;
 import org.jruby.ast.IfNode;
+import org.jruby.ast.NewlineNode;
+import org.jruby.ast.Node;
 import org.jruby.ast.WhenNode;
 import org.jruby.evaluator.Instruction;
 import org.rubypeople.rdt.internal.core.parser.warnings.RubyLintVisitor;
@@ -70,7 +72,12 @@
 		WhenNode when = (WhenNode) iVisited.getFirstWhenNode();
 		while (when != null) {
 			branchCount++;
-			when = (WhenNode) when.getNextCase();
+			Node thing = when.getNextCase();
+			if (thing instanceof WhenNode) {
+				when = (WhenNode) when.getNextCase();
+			} else {
+				when = null;
+			}			
 		}
 		return super.visitCaseNode(iVisited);
 	}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.