[Rubyeclipse-commit] SF.net SVN: rubyeclipse: [1906] trunk

[<mir...@us...>]

Revision: 1906
          http://svn.sourceforge.net/rubyeclipse/?rev=1906&view=rev
Author:   mirkostocker
Date:     2007-02-02 06:17:43 -0800 (Fri, 02 Feb 2007)

Log Message:
-----------
update jruby and remove the patches

Modified Paths:
--------------
    trunk/org.jruby/META-INF/MANIFEST.MF
    trunk/org.jruby/lib/jruby.jar
    trunk/org.jruby/src.zip
    trunk/org.rubypeople.rdt-feature/feature.xml
    trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/RubyScriptStructureBuilder.java
    trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/parser/InOrderVisitor.java
    trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/util/DOMFinder.java

Removed Paths:
-------------
    trunk/org.jruby/patches/

Modified: trunk/org.jruby/META-INF/MANIFEST.MF
===================================================================
--- trunk/org.jruby/META-INF/MANIFEST.MF	2007-02-01 13:57:37 UTC (rev 1905)
+++ trunk/org.jruby/META-INF/MANIFEST.MF	2007-02-02 14:17:43 UTC (rev 1906)
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Jruby Plug-in
 Bundle-SymbolicName: org.jruby
-Bundle-Version: 0.9.2.2742
+Bundle-Version: 0.9.2.2921
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.core.runtime
 Eclipse-LazyStart: false

Modified: trunk/org.jruby/lib/jruby.jar
===================================================================
(Binary files differ)

Modified: trunk/org.jruby/src.zip
===================================================================
(Binary files differ)

Modified: trunk/org.rubypeople.rdt-feature/feature.xml
===================================================================
--- trunk/org.rubypeople.rdt-feature/feature.xml	2007-02-01 13:57:37 UTC (rev 1905)
+++ trunk/org.rubypeople.rdt-feature/feature.xml	2007-02-02 14:17:43 UTC (rev 1906)
@@ -336,7 +336,7 @@
          id="org.jruby"
          download-size="0"
          install-size="0"
-         version="0.9.2.2742"
+         version="0.9.2.2921"
          unpack="false"/>
 
 </feature>

Modified: trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/RubyScriptStructureBuilder.java
===================================================================
--- trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/RubyScriptStructureBuilder.java	2007-02-01 13:57:37 UTC (rev 1905)
+++ trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/RubyScriptStructureBuilder.java	2007-02-02 14:17:43 UTC (rev 1906)
@@ -328,7 +328,6 @@
 		handleNode(iVisited);
 		visitNode(iVisited.getArgsNode());
 		visitNode(iVisited.getBodyNode());
-		visitNode(iVisited.getIterNode());
 		return null;
 	}
 
@@ -466,6 +465,7 @@
 			System.out.println(iVisited.getName());
 		visitNode(iVisited.getReceiverNode());
 		visitNode(iVisited.getArgsNode());
+		visitNode(iVisited.getIterNode());
 		return null;
 	}
 
@@ -962,6 +962,7 @@
 			
 		}
 		visitNode(iVisited.getArgsNode());
+		visitNode(iVisited.getIterNode());
 		return null;
 	}
 
@@ -1183,7 +1184,6 @@
 		RubyBlock block = new RubyBlock(modelStack.peek());
 		modelStack.push(block);
 
-		visitNode(iVisited.getIterNode());
 		visitNode(iVisited.getVarNode());
 		visitNode(iVisited.getBodyNode());
 		if (DEBUG)

Modified: trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/parser/InOrderVisitor.java
===================================================================
--- trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/parser/InOrderVisitor.java	2007-02-01 13:57:37 UTC (rev 1905)
+++ trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/parser/InOrderVisitor.java	2007-02-02 14:17:43 UTC (rev 1906)
@@ -260,7 +260,6 @@
 		handleNode(iVisited);
 		acceptNode(iVisited.getArgsNode());
 		acceptNode(iVisited.getBodyNode());
-		acceptNode(iVisited.getIterNode());
 		return null;
 	}
 
@@ -327,6 +326,7 @@
 		handleNode(iVisited);
 		acceptNode(iVisited.getReceiverNode());
 		acceptNode(iVisited.getArgsNode());
+		acceptNode(iVisited.getIterNode());
 		return null;
 	}
 
@@ -529,6 +529,7 @@
 	public Instruction visitFCallNode(FCallNode iVisited) {
 		handleNode(iVisited);
 		acceptNode(iVisited.getArgsNode());
+		acceptNode(iVisited.getIterNode());
 		return null;
 	}
 
@@ -660,7 +661,6 @@
 	 */
 	public Instruction visitIterNode(IterNode iVisited) {
 		handleNode(iVisited);
-		acceptNode(iVisited.getIterNode());
 		acceptNode(iVisited.getVarNode());
 		acceptNode(iVisited.getBodyNode());
 		return null;

Modified: trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/util/DOMFinder.java
===================================================================
--- trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/util/DOMFinder.java	2007-02-01 13:57:37 UTC (rev 1905)
+++ trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/util/DOMFinder.java	2007-02-02 14:17:43 UTC (rev 1906)
@@ -180,7 +180,6 @@
 	public Instruction visitBlockPassNode(BlockPassNode iVisited) {
 		visitNode(iVisited.getArgsNode());
 		visitNode(iVisited.getBodyNode());
-		visitNode(iVisited.getIterNode());
 		return null;
 	}
 
@@ -192,6 +191,7 @@
 	public Instruction visitCallNode(CallNode iVisited) {
 		visitNode(iVisited.getReceiverNode());
 		visitNode(iVisited.getArgsNode());
+		visitNode(iVisited.getIterNode());
 		return null;
 	}
 


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