[Rubyeclipse-commit] org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core RubyScriptStructureBuilder.java,1.9,1.10

[David C. <dc...@us...>]

Update of /cvsroot/rubyeclipse/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21686/src/org/rubypeople/rdt/internal/core

Modified Files:
	RubyScriptStructureBuilder.java 
Log Message:
Upgraded to JRuby head.
More work on Updating the Symbol Index for class names.

Index: RubyScriptStructureBuilder.java
===================================================================
RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/RubyScriptStructureBuilder.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** RubyScriptStructureBuilder.java	6 Aug 2005 02:44:59 -0000	1.9
--- RubyScriptStructureBuilder.java	9 Oct 2005 22:14:06 -0000	1.10
***************
*** 35,39 ****
  import org.jruby.ast.ArgsNode;
  import org.jruby.ast.ArrayNode;
- import org.jruby.ast.AttrSetNode;
  import org.jruby.ast.BackRefNode;
  import org.jruby.ast.BeginNode;
--- 35,38 ----
***************
*** 127,132 ****
  import org.jruby.lexer.yacc.ISourcePosition;
  import org.jruby.runtime.Visibility;
- import org.rubypeople.rdt.core.IRubyElement;
  import org.rubypeople.rdt.core.IMethod;
  import org.rubypeople.rdt.core.IRubyScript;
  import org.rubypeople.rdt.internal.core.parser.RubyParser;
--- 126,131 ----
  import org.jruby.lexer.yacc.ISourcePosition;
  import org.jruby.runtime.Visibility;
  import org.rubypeople.rdt.core.IMethod;
+ import org.rubypeople.rdt.core.IRubyElement;
  import org.rubypeople.rdt.core.IRubyScript;
  import org.rubypeople.rdt.internal.core.parser.RubyParser;
***************
*** 233,245 ****
  	 * (non-Javadoc)
  	 * 
- 	 * @see org.jruby.ast.visitor.NodeVisitor#visitAttrSetNode(org.jruby.ast.AttrSetNode)
- 	 */
- 	public void visitAttrSetNode(AttrSetNode iVisited) {
- 		handleNode(iVisited);
- 	}
- 
- 	/*
- 	 * (non-Javadoc)
- 	 * 
  	 * @see org.jruby.ast.visitor.NodeVisitor#visitBackRefNode(org.jruby.ast.BackRefNode)
  	 */
--- 232,235 ----
***************
*** 448,452 ****
  	public void visitClassNode(ClassNode iVisited) {
  		handleNode(iVisited);
! 		String name = iVisited.getClassName();
  		RubyType handle = new RubyType(modelStack.peek(), name);
  		modelStack.push(handle);
--- 438,442 ----
  	public void visitClassNode(ClassNode iVisited) {
  		handleNode(iVisited);
! 		String name = iVisited.getCPath().getName();
  		RubyType handle = new RubyType(modelStack.peek(), name);
  		modelStack.push(handle);
***************
*** 1165,1169 ****
  	public void visitModuleNode(ModuleNode iVisited) {
  		handleNode(iVisited);
! 		String name = iVisited.getName();
  		RubyModule module = new RubyModule(modelStack.peek(), name);
  		modelStack.push(module);
--- 1155,1159 ----
  	public void visitModuleNode(ModuleNode iVisited) {
  		handleNode(iVisited);
! 		String name = iVisited.getCPath().getName();
  		RubyModule module = new RubyModule(modelStack.peek(), name);
  		modelStack.push(module);