Menu
▾
▴
[Rubyeclipse-commit] SF.net SVN: rubyeclipse: [2162] trunk/org.rubypeople.rdt.core/src/org/ rubypeople/rdt/internal
|
From: <tc...@us...> - 2007-03-14 14:34:31
|
Revision: 2162
http://svn.sourceforge.net/rubyeclipse/?rev=2162&view=rev
Author: tcorbat
Date: 2007-03-14 06:54:14 -0700 (Wed, 14 Mar 2007)
Log Message:
-----------
Adapted ListNode access, as in new JRuby version iterator() of ListNode is not available anymore. Replaced .iterator() calls with .childNodes().iterator(). Should be working like before.
Modified Paths:
--------------
trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/RubyScriptStructureBuilder.java
trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/builder/TaskCompiler.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/ASTUtil.java
trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/util/DOMFinder.java
trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/ti/DefaultTypeInferrer.java
trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/ti/TypeInferenceHelper.java
trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/ti/util/AttributeLocator.java
trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/ti/util/OffsetNodeLocator.java
trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/ti/util/ScopedNodeLocator.java
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-03-14 13:37:47 UTC (rev 2161)
+++ trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/RubyScriptStructureBuilder.java 2007-03-14 13:54:14 UTC (rev 2162)
@@ -239,7 +239,7 @@
handleNode(iVisited);
visitNode(iVisited.getBlockArgNode());
if (iVisited.getOptArgs() != null) {
- visitIter(iVisited.getOptArgs().iterator());
+ visitIter(iVisited.getOptArgs().childNodes().iterator());
}
return null;
}
@@ -263,7 +263,7 @@
*/
public Instruction visitArrayNode(ArrayNode iVisited) {
handleNode(iVisited);
- visitIter(iVisited.iterator());
+ visitIter(iVisited.childNodes().iterator());
return null;
}
@@ -325,7 +325,7 @@
*/
public Instruction visitBlockNode(BlockNode iVisited) {
handleNode(iVisited);
- visitIter(iVisited.iterator());
+ visitIter(iVisited.childNodes().iterator());
return null;
}
@@ -675,7 +675,7 @@
*/
public Instruction visitDRegxNode(DRegexpNode iVisited) {
handleNode(iVisited);
- visitIter(iVisited.iterator());
+ visitIter(iVisited.childNodes().iterator());
return null;
}
@@ -686,7 +686,7 @@
*/
public Instruction visitDStrNode(DStrNode iVisited) {
handleNode(iVisited);
- visitIter(iVisited.iterator());
+ visitIter(iVisited.childNodes().iterator());
return null;
}
@@ -697,7 +697,7 @@
*/
public Instruction visitDSymbolNode(DSymbolNode iVisited) {
handleNode(iVisited);
- visitIter(iVisited.iterator());
+ visitIter(iVisited.childNodes().iterator());
return null;
}
@@ -720,7 +720,7 @@
*/
public Instruction visitDXStrNode(DXStrNode iVisited) {
handleNode(iVisited);
- visitIter(iVisited.iterator());
+ visitIter(iVisited.childNodes().iterator());
return null;
}
@@ -966,7 +966,7 @@
}
else if (argsNode instanceof ArrayNode) {
ArrayNode arrayNode = (ArrayNode) iVisited.getArgsNode();
- iter = arrayNode.iterator();
+ iter = arrayNode.childNodes().iterator();
}
for (; iter.hasNext();) {
Node mixinNameNode = (Node) iter.next();
@@ -974,7 +974,7 @@
mixins.add( ((StrNode)mixinNameNode).getValue().toString() );
}
if ( mixinNameNode instanceof DStrNode ) {
- Node next = (Node)((DStrNode)mixinNameNode).iterator().next();
+ Node next = (Node)((DStrNode)mixinNameNode).childNodes().iterator().next();
if ( next instanceof StrNode ) {
mixins.add( ((StrNode)next).getValue().toString() );
}
@@ -1011,10 +1011,10 @@
* @return
*/
private String getString(ArrayNode node) {
- Object tmp = node.iterator().next();
+ Object tmp = node.childNodes().iterator().next();
if (tmp instanceof DStrNode) {
DStrNode dstrNode = (DStrNode) tmp;
- tmp = dstrNode.iterator().next();
+ tmp = dstrNode.childNodes().iterator().next();
}
if (tmp instanceof StrNode) {
StrNode strNode = (StrNode) tmp;
Modified: trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/builder/TaskCompiler.java
===================================================================
--- trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/builder/TaskCompiler.java 2007-03-14 13:37:47 UTC (rev 2161)
+++ trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/builder/TaskCompiler.java 2007-03-14 13:54:14 UTC (rev 2162)
@@ -47,7 +47,5 @@
} finally {
IoUtils.closeQuietly(contents);
}
-
}
-
}
\ No newline at end of file
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-03-14 13:37:47 UTC (rev 2161)
+++ trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/parser/InOrderVisitor.java 2007-03-14 13:54:14 UTC (rev 2162)
@@ -161,7 +161,7 @@
handleNode(iVisited);
acceptNode(iVisited.getBlockArgNode());
if (iVisited.getOptArgs() != null) {
- visitIter(iVisited.getOptArgs().iterator());
+ visitIter(iVisited.getOptArgs().childNodes().iterator());
}
return null;
}
@@ -185,7 +185,7 @@
*/
public Instruction visitArrayNode(ArrayNode iVisited) {
handleNode(iVisited);
- visitIter(iVisited.iterator());
+ visitIter(iVisited.childNodes().iterator());
return null;
}
@@ -247,7 +247,7 @@
*/
public Instruction visitBlockNode(BlockNode iVisited) {
handleNode(iVisited);
- visitIter(iVisited.iterator());
+ visitIter(iVisited.childNodes().iterator());
return null;
}
@@ -403,7 +403,7 @@
*/
public Instruction visitDRegxNode(DRegexpNode iVisited) {
handleNode(iVisited);
- visitIter(iVisited.iterator());
+ visitIter(iVisited.childNodes().iterator());
return null;
}
@@ -414,7 +414,7 @@
*/
public Instruction visitDStrNode(DStrNode iVisited) {
handleNode(iVisited);
- visitIter(iVisited.iterator());
+ visitIter(iVisited.childNodes().iterator());
return null;
}
@@ -425,7 +425,7 @@
*/
public Instruction visitDSymbolNode(DSymbolNode iVisited) {
handleNode(iVisited);
- visitIter(iVisited.iterator());
+ visitIter(iVisited.childNodes().iterator());
return null;
}
@@ -446,7 +446,7 @@
*/
public Instruction visitDXStrNode(DXStrNode iVisited) {
handleNode(iVisited);
- visitIter(iVisited.iterator());
+ visitIter(iVisited.childNodes().iterator());
return null;
}
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-03-14 13:37:47 UTC (rev 2161)
+++ trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/util/ASTUtil.java 2007-03-14 13:54:14 UTC (rev 2162)
@@ -73,7 +73,7 @@
private static List<String> getArguments(ListNode argList) {
if (argList == null) return new ArrayList<String>();
List<String> arguments = new ArrayList<String>();
- for (Iterator iter = argList.iterator(); iter.hasNext();) {
+ for (Iterator iter = argList.childNodes().iterator(); iter.hasNext();) {
Object node = iter.next();
if (node instanceof ArgumentNode) {
arguments.add(((ArgumentNode) node).getName());
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-03-14 13:37:47 UTC (rev 2161)
+++ trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/core/util/DOMFinder.java 2007-03-14 13:54:14 UTC (rev 2162)
@@ -138,7 +138,7 @@
public Instruction visitArgsNode(ArgsNode iVisited) {
visitNode(iVisited.getBlockArgNode());
if (iVisited.getOptArgs() != null) {
- visitIter(iVisited.getOptArgs().iterator());
+ visitIter(iVisited.getOptArgs().childNodes().iterator());
}
return null;
}
@@ -151,7 +151,7 @@
}
public Instruction visitArrayNode(ArrayNode iVisited) {
- visitIter(iVisited.iterator());
+ visitIter(iVisited.childNodes().iterator());
return null;
}
@@ -173,7 +173,7 @@
}
public Instruction visitBlockNode(BlockNode iVisited) {
- visitIter(iVisited.iterator());
+ visitIter(iVisited.childNodes().iterator());
return null;
}
Modified: trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/ti/DefaultTypeInferrer.java
===================================================================
--- trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/ti/DefaultTypeInferrer.java 2007-03-14 13:37:47 UTC (rev 2161)
+++ trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/ti/DefaultTypeInferrer.java 2007-03-14 13:54:14 UTC (rev 2162)
@@ -336,7 +336,7 @@
int argNumber = 0;
ListNode args = argsNode.getArgs();
if (args == null) return -1; // no args. Maybe we should check arity instead?
- for (Iterator iter = args.iterator(); iter.hasNext();) {
+ for (Iterator iter = args.childNodes().iterator(); iter.hasNext();) {
ArgumentNode arg = (ArgumentNode) iter.next();
if (arg.getName().equals(argName)) {
break;
Modified: trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/ti/TypeInferenceHelper.java
===================================================================
--- trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/ti/TypeInferenceHelper.java 2007-03-14 13:37:47 UTC (rev 2161)
+++ trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/ti/TypeInferenceHelper.java 2007-03-14 13:54:14 UTC (rev 2162)
@@ -42,7 +42,7 @@
public int getArgIndex(ListNode listNode, String argName)
{
int argNumber = 0;
- for ( Iterator iter = listNode.iterator(); iter.hasNext();) {
+ for ( Iterator iter = listNode.childNodes().iterator(); iter.hasNext();) {
if (((ArgumentNode)iter.next()).getName().equals(argName)) { return argNumber; }
argNumber++;
}
Modified: trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/ti/util/AttributeLocator.java
===================================================================
--- trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/ti/util/AttributeLocator.java 2007-03-14 13:37:47 UTC (rev 2161)
+++ trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/ti/util/AttributeLocator.java 2007-03-14 13:54:14 UTC (rev 2162)
@@ -69,7 +69,7 @@
Node argsNode = fCallNode.getArgsNode();
if ( argsNode instanceof ArrayNode ) {
ArrayNode arrayNode = (ArrayNode)argsNode;
- for (Iterator iter = arrayNode.iterator(); iter.hasNext();) {
+ for (Iterator iter = arrayNode.childNodes().iterator(); iter.hasNext();) {
Node argNode = (Node) iter.next();
// The nodes are found - record them!
Modified: trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/ti/util/OffsetNodeLocator.java
===================================================================
--- trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/ti/util/OffsetNodeLocator.java 2007-03-14 13:37:47 UTC (rev 2161)
+++ trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/ti/util/OffsetNodeLocator.java 2007-03-14 13:54:14 UTC (rev 2162)
@@ -62,7 +62,7 @@
{
ArgsNode argsNode = (ArgsNode)node;
if ( argsNode.getArgsCount() > 0 ) {
- for (Iterator iter = argsNode.getArgs().iterator(); iter.hasNext();) {
+ for (Iterator iter = argsNode.getArgs().childNodes().iterator(); iter.hasNext();) {
ArgumentNode argNode = (ArgumentNode) iter.next();
if ( nodeDoesSpanOffset(argNode, offset) ) {
// System.out.println("Refining " + node.getClass().getSimpleName() + "["+node.getPosition().getStartOffset() + ".." + node.getPosition().getEndOffset() + "] to " + argNode.getClass().getSimpleName() + "["+argNode.getPosition().getStartOffset() + ".." + argNode.getPosition().getEndOffset() + "]");
Modified: trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/ti/util/ScopedNodeLocator.java
===================================================================
--- trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/ti/util/ScopedNodeLocator.java 2007-03-14 13:37:47 UTC (rev 2161)
+++ trunk/org.rubypeople.rdt.core/src/org/rubypeople/rdt/internal/ti/util/ScopedNodeLocator.java 2007-03-14 13:54:14 UTC (rev 2162)
@@ -69,7 +69,7 @@
public Instruction visitArgsNode(ArgsNode iVisited) {
if ( iVisited.getArgsCount() > 0 )
{
- for (Iterator iter = iVisited.getArgs().iterator(); iter.hasNext();) {
+ for (Iterator iter = iVisited.getArgs().childNodes().iterator(); iter.hasNext();) {
ArgumentNode argNode = (ArgumentNode) iter.next();
if ( acceptor.doesAccept(argNode))
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
