[Rubyeclipse-commit] SF.net SVN: rubyeclipse: [2411] trunk/org.rubypeople.rdt.core/src/org/ rubypeople/rdt/internal/core/util/ASTUtil.java

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

Revision: 2411
          http://svn.sourceforge.net/rubyeclipse/?rev=2411&view=rev
Author:   cawilliams
Date:     2007-05-01 10:24:19 -0700 (Tue, 01 May 2007)

Log Message:
-----------
handle grabbing name from ClassNode or ModuleNode

Modified Paths:
--------------
    trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/util/ASTUtil.java

Modified: trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/util/ASTUtil.java
===================================================================
--- trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/util/ASTUtil.java	2007-05-01 16:11:29 UTC (rev 2410)
+++ trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/util/ASTUtil.java	2007-05-01 17:24:19 UTC (rev 2411)
@@ -8,6 +8,7 @@
 import org.jruby.ast.ArgsNode;
 import org.jruby.ast.ArgumentNode;
 import org.jruby.ast.AttrAssignNode;
+import org.jruby.ast.ClassNode;
 import org.jruby.ast.ClassVarAsgnNode;
 import org.jruby.ast.Colon2Node;
 import org.jruby.ast.ConstNode;
@@ -19,6 +20,7 @@
 import org.jruby.ast.InstAsgnNode;
 import org.jruby.ast.ListNode;
 import org.jruby.ast.LocalAsgnNode;
+import org.jruby.ast.ModuleNode;
 import org.jruby.ast.NilNode;
 import org.jruby.ast.Node;
 import org.jruby.ast.SelfNode;
@@ -147,6 +149,14 @@
 	 * @return name or null
 	 */
 	public static String getNameReflectively(Node node) {
+		if (node instanceof ClassNode) {
+			ClassNode classNode = (ClassNode) node;
+			return getNameReflectively(classNode.getCPath());
+		}
+		if (node instanceof ModuleNode) {
+			ModuleNode moduleNode = (ModuleNode) node;
+			return getNameReflectively(moduleNode.getCPath());
+		}
 		if (node instanceof INameNode) {
 			return ((INameNode)node).getName();
 		}


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