[ruby-core:22455] Re: YASNP (Yet Another Selector Namespace Proposal)
From:
Charles Oliver Nutter <charles.nutter@...>
Date:
2009-02-25 07:30:24 UTC
List:
ruby-core #22455
Yehuda Katz wrote: > I'd like that a lot :) Here's a patch that extends it at least to all forms of CallNode, which is probably the primary case. fcalls and vcalls are against self, and will probably be less common to namespace. attr/op/element assignments will probably be rare for similar reasons. But they'd probably all need similar treatment. This patch is a bit bigger and messier, but still only about a half hour's work. A better design would be to enlist the parser in this process. It would also produce better-performing code; I don't expect this version to perform particularly well. I've also attached a really primitive rspec that shows "using" inside an eval. In the current prototype, using is scoped to the eval body as if it were a file. I kinda like it. - Charlie
Attachments (2)
more_selector_namespaces_2.patch
(71.4 KB, text/x-diff)
diff --git a/src/org/jruby/ast/BlockAcceptingNode.java b/src/org/jruby/ast/BlockAcceptingNode.java
index a564863..b3c7535 100644
--- a/src/org/jruby/ast/BlockAcceptingNode.java
+++ b/src/org/jruby/ast/BlockAcceptingNode.java
@@ -29,6 +29,8 @@
***** END LICENSE BLOCK *****/
package org.jruby.ast;
+import org.jruby.parser.ParserSupport;
+
/**
* Any thing which implements this represents a Callable-like node which can have a block
* associated with it as part of that call. The calls which can be this are: CallNode, FCallNode,
@@ -41,5 +43,5 @@ package org.jruby.ast;
public interface BlockAcceptingNode {
public Node getIterNode();
- public Node setIterNode(Node iterNode);
+ public Node setIterNode(Node iterNode, ParserSupport support);
}
\ No newline at end of file
diff --git a/src/org/jruby/ast/CallManyArgsBlockNode.java b/src/org/jruby/ast/CallManyArgsBlockNode.java
index fa3f542..46c85f0 100644
--- a/src/org/jruby/ast/CallManyArgsBlockNode.java
+++ b/src/org/jruby/ast/CallManyArgsBlockNode.java
@@ -32,9 +32,11 @@
***** END LICENSE BLOCK *****/
package org.jruby.ast;
+import java.util.List;
import org.jruby.Ruby;
import org.jruby.RubyLocalJumpError.Reason;
import org.jruby.exceptions.JumpException;
+import org.jruby.internal.runtime.methods.DynamicMethod;
import org.jruby.javasupport.util.RuntimeHelpers;
import org.jruby.lexer.yacc.ISourcePosition;
import org.jruby.runtime.Block;
@@ -46,15 +48,29 @@ import org.jruby.runtime.builtin.IRubyObject;
*/
public final class CallManyArgsBlockNode extends CallNode {
public CallManyArgsBlockNode(ISourcePosition position, Node receiverNode, String name, Node args, IterNode iter) {
- super(position, receiverNode, name, args, iter);
+ super(position, receiverNode, name, args, iter, null);
}
-
+
+ public CallManyArgsBlockNode(ISourcePosition position, Node receiverNode, String name, Node args, IterNode iter, List<Node> namespaces) {
+ super(position, receiverNode, name, args, iter, namespaces);
+ }
+
@Override
public IRubyObject interpret(Ruby runtime, ThreadContext context, IRubyObject self, Block aBlock) {
IRubyObject receiver = getReceiverNode().interpret(runtime, context, self, aBlock);
IRubyObject[] args = ((ArrayNode) getArgsNode()).interpretPrimitive(runtime, context, self, aBlock);
Block block = RuntimeHelpers.getBlock(context, self, iterNode);
-
+
+ DynamicMethod method = getNamespacedMethod(runtime, context, self, receiver, aBlock);
+ if (method != null && !method.isUndefined()) {
+ try {
+ return method.call(context, receiver, receiver.getMetaClass(), callAdapter.methodName, args, block);
+ } catch (JumpException.RetryJump rj) {
+ throw runtime.newLocalJumpError(Reason.RETRY, self, "retry is not supported outside rescue");
+ } finally {
+ block.escape();
+ }
+ }
try {
return callAdapter.call(context, self, receiver, args, block);
} catch (JumpException.RetryJump rj) {
diff --git a/src/org/jruby/ast/CallManyArgsBlockPassNode.java b/src/org/jruby/ast/CallManyArgsBlockPassNode.java
index eba32f7..9afd267 100644
--- a/src/org/jruby/ast/CallManyArgsBlockPassNode.java
+++ b/src/org/jruby/ast/CallManyArgsBlockPassNode.java
@@ -32,7 +32,9 @@
***** END LICENSE BLOCK *****/
package org.jruby.ast;
+import java.util.List;
import org.jruby.Ruby;
+import org.jruby.internal.runtime.methods.DynamicMethod;
import org.jruby.javasupport.util.RuntimeHelpers;
import org.jruby.lexer.yacc.ISourcePosition;
import org.jruby.runtime.Block;
@@ -45,15 +47,24 @@ import org.jruby.runtime.builtin.IRubyObject;
public final class CallManyArgsBlockPassNode extends CallNode {
// For 'b.foo()'. Args are only significant in maintaining backwards compatible AST structure
public CallManyArgsBlockPassNode(ISourcePosition position, Node receiverNode, String name, Node args, BlockPassNode iter) {
- super(position, receiverNode, name, args, iter);
+ super(position, receiverNode, name, args, iter, null);
}
-
+
+ // For 'b.foo()'. Args are only significant in maintaining backwards compatible AST structure
+ public CallManyArgsBlockPassNode(ISourcePosition position, Node receiverNode, String name, Node args, BlockPassNode iter, List<Node> namespaces) {
+ super(position, receiverNode, name, args, iter, namespaces);
+ }
+
@Override
public IRubyObject interpret(Ruby runtime, ThreadContext context, IRubyObject self, Block aBlock) {
IRubyObject receiver = getReceiverNode().interpret(runtime, context, self, aBlock);
IRubyObject[] args = ((ArrayNode) getArgsNode()).interpretPrimitive(runtime, context, self, aBlock);
Block block = RuntimeHelpers.getBlock(runtime, context, self, iterNode, aBlock);
-
+
+ DynamicMethod method = getNamespacedMethod(runtime, context, self, receiver, aBlock);
+ if (method != null && !method.isUndefined()) {
+ return method.call(context, receiver, receiver.getMetaClass(), callAdapter.methodName, args, block);
+ }
return callAdapter.call(context, self, receiver, args, block);
}
}
diff --git a/src/org/jruby/ast/CallManyArgsNode.java b/src/org/jruby/ast/CallManyArgsNode.java
index 2775fb5..4e6ee45 100644
--- a/src/org/jruby/ast/CallManyArgsNode.java
+++ b/src/org/jruby/ast/CallManyArgsNode.java
@@ -32,8 +32,11 @@
***** END LICENSE BLOCK *****/
package org.jruby.ast;
+import java.util.List;
import org.jruby.Ruby;
+import org.jruby.internal.runtime.methods.DynamicMethod;
import org.jruby.lexer.yacc.ISourcePosition;
+import org.jruby.parser.ParserSupport;
import org.jruby.runtime.Block;
import org.jruby.runtime.ThreadContext;
import org.jruby.runtime.builtin.IRubyObject;
@@ -43,11 +46,15 @@ import org.jruby.runtime.builtin.IRubyObject;
*/
public final class CallManyArgsNode extends CallNode {
public CallManyArgsNode(ISourcePosition position, Node receiverNode, String name, Node args) {
- super(position, receiverNode, name, args, null);
+ super(position, receiverNode, name, args, null, null);
}
-
+
+ public CallManyArgsNode(ISourcePosition position, Node receiverNode, String name, Node args, List<Node> namespaces) {
+ super(position, receiverNode, name, args, null, namespaces);
+ }
+
@Override
- public Node setIterNode(Node iterNode) {
+ public Node setIterNode(Node iterNode, ParserSupport support) {
return new CallManyArgsBlockNode(getPosition(), getReceiverNode(), getName(), getArgsNode(), (IterNode) iterNode);
}
@@ -55,7 +62,11 @@ public final class CallManyArgsNode extends CallNode {
public IRubyObject interpret(Ruby runtime, ThreadContext context, IRubyObject self, Block aBlock) {
IRubyObject receiver = getReceiverNode().interpret(runtime, context, self, aBlock);
IRubyObject[] args = ((ArrayNode) getArgsNode()).interpretPrimitive(runtime, context, self, aBlock);
-
+
+ DynamicMethod method = getNamespacedMethod(runtime, context, self, receiver, aBlock);
+ if (method != null && !method.isUndefined()) {
+ return method.call(context, receiver, receiver.getMetaClass(), callAdapter.methodName, args);
+ }
return callAdapter.call(context, self, receiver, args);
}
}
diff --git a/src/org/jruby/ast/CallNoArgBlockNode.java b/src/org/jruby/ast/CallNoArgBlockNode.java
index a7c8ae8..f2b3d6d 100644
--- a/src/org/jruby/ast/CallNoArgBlockNode.java
+++ b/src/org/jruby/ast/CallNoArgBlockNode.java
@@ -32,9 +32,11 @@
***** END LICENSE BLOCK *****/
package org.jruby.ast;
+import java.util.List;
import org.jruby.Ruby;
import org.jruby.RubyLocalJumpError.Reason;
import org.jruby.exceptions.JumpException;
+import org.jruby.internal.runtime.methods.DynamicMethod;
import org.jruby.javasupport.util.RuntimeHelpers;
import org.jruby.lexer.yacc.ISourcePosition;
import org.jruby.runtime.Block;
@@ -47,19 +49,39 @@ import org.jruby.runtime.builtin.IRubyObject;
public final class CallNoArgBlockNode extends CallNode {
// For b.foo
public CallNoArgBlockNode(ISourcePosition position, Node receiverNode, String name, IterNode iter) {
- super(position, receiverNode, name, null, iter);
+ super(position, receiverNode, name, null, iter, null);
}
// For 'b.foo()'. Args are only significant in maintaining backwards compatible AST structure
public CallNoArgBlockNode(ISourcePosition position, Node receiverNode, String name, Node args, IterNode iter) {
- super(position, receiverNode, name, args, iter);
+ super(position, receiverNode, name, args, iter, null);
}
-
+
+ // For b.foo
+ public CallNoArgBlockNode(ISourcePosition position, Node receiverNode, String name, IterNode iter, List<Node> namespaces) {
+ super(position, receiverNode, name, null, iter, namespaces);
+ }
+
+ // For 'b.foo()'. Args are only significant in maintaining backwards compatible AST structure
+ public CallNoArgBlockNode(ISourcePosition position, Node receiverNode, String name, Node args, IterNode iter, List<Node> namespaces) {
+ super(position, receiverNode, name, args, iter, namespaces);
+ }
+
@Override
public IRubyObject interpret(Ruby runtime, ThreadContext context, IRubyObject self, Block aBlock) {
IRubyObject receiver = getReceiverNode().interpret(runtime, context, self, aBlock);
Block block = RuntimeHelpers.getBlock(context, self, iterNode);
-
+
+ DynamicMethod method = getNamespacedMethod(runtime, context, self, receiver, aBlock);
+ if (method != null && !method.isUndefined()) {
+ try {
+ return method.call(context, receiver, receiver.getMetaClass(), callAdapter.methodName, block);
+ } catch (JumpException.RetryJump rj) {
+ throw runtime.newLocalJumpError(Reason.RETRY, self, "retry is not supported outside rescue");
+ } finally {
+ block.escape();
+ }
+ }
try {
return callAdapter.call(context, self, receiver, block);
} catch (JumpException.RetryJump rj) {
diff --git a/src/org/jruby/ast/CallNoArgBlockPassNode.java b/src/org/jruby/ast/CallNoArgBlockPassNode.java
index 229e5aa..226a191 100644
--- a/src/org/jruby/ast/CallNoArgBlockPassNode.java
+++ b/src/org/jruby/ast/CallNoArgBlockPassNode.java
@@ -32,7 +32,9 @@
***** END LICENSE BLOCK *****/
package org.jruby.ast;
+import java.util.List;
import org.jruby.Ruby;
+import org.jruby.internal.runtime.methods.DynamicMethod;
import org.jruby.javasupport.util.RuntimeHelpers;
import org.jruby.lexer.yacc.ISourcePosition;
import org.jruby.runtime.Block;
@@ -45,13 +47,23 @@ import org.jruby.runtime.builtin.IRubyObject;
public final class CallNoArgBlockPassNode extends CallNode {
// For 'b.foo()'. Args are only significant in maintaining backwards compatible AST structure
public CallNoArgBlockPassNode(ISourcePosition position, Node receiverNode, String name, Node args, BlockPassNode iter) {
- super(position, receiverNode, name, args, iter);
+ super(position, receiverNode, name, args, iter, null);
}
-
+
+ // For 'b.foo()'. Args are only significant in maintaining backwards compatible AST structure
+ public CallNoArgBlockPassNode(ISourcePosition position, Node receiverNode, String name, Node args, BlockPassNode iter, List<Node> namespaces) {
+ super(position, receiverNode, name, args, iter, namespaces);
+ }
+
@Override
public IRubyObject interpret(Ruby runtime, ThreadContext context, IRubyObject self, Block aBlock) {
+ IRubyObject receiver = getReceiverNode().interpret(runtime, context, self, aBlock);
+ DynamicMethod method = getNamespacedMethod(runtime, context, self, receiver, aBlock);
+ if (method != null && !method.isUndefined()) {
+ return method.call(context, receiver, receiver.getMetaClass(), callAdapter.methodName, RuntimeHelpers.getBlock(runtime, context, self, iterNode, aBlock));
+ }
return callAdapter.call(context, self,
- getReceiverNode().interpret(runtime, context, self, aBlock),
+ receiver,
RuntimeHelpers.getBlock(runtime, context, self, iterNode, aBlock));
}
}
diff --git a/src/org/jruby/ast/CallNoArgNode.java b/src/org/jruby/ast/CallNoArgNode.java
index 1b2cd40..faa09e6 100644
--- a/src/org/jruby/ast/CallNoArgNode.java
+++ b/src/org/jruby/ast/CallNoArgNode.java
@@ -32,11 +32,13 @@
***** END LICENSE BLOCK *****/
package org.jruby.ast;
+import java.util.List;
import org.jruby.Ruby;
import org.jruby.RubyClass;
import org.jruby.exceptions.JumpException;
import org.jruby.internal.runtime.methods.DynamicMethod;
import org.jruby.lexer.yacc.ISourcePosition;
+import org.jruby.parser.ParserSupport;
import org.jruby.runtime.Block;
import org.jruby.runtime.ThreadContext;
import org.jruby.runtime.Visibility;
@@ -48,22 +50,39 @@ import org.jruby.runtime.builtin.IRubyObject;
public final class CallNoArgNode extends CallNode {
// For 'b.foo'
public CallNoArgNode(ISourcePosition position, Node receiverNode, String name) {
- super(position, receiverNode, name, null, null);
+ super(position, receiverNode, name, null, null, null);
+ }
+
+ // For 'b.foo()'. Args are only significant in maintaining backwards compatible AST structure
+ public CallNoArgNode(ISourcePosition position, Node receiverNode, String name, List<Node> namespaces) {
+ super(position, receiverNode, name, null, null, namespaces);
}
// For 'b.foo()'. Args are only significant in maintaining backwards compatible AST structure
public CallNoArgNode(ISourcePosition position, Node receiverNode, Node args, String name) {
- super(position, receiverNode, name, args, null);
+ super(position, receiverNode, name, args, null, null);
+ }
+
+ // For 'b.foo()'. Args are only significant in maintaining backwards compatible AST structure
+ public CallNoArgNode(ISourcePosition position, Node receiverNode, Node args, String name, List<Node> namespaces) {
+ super(position, receiverNode, name, args, null, namespaces);
}
@Override
public IRubyObject interpret(Ruby runtime, ThreadContext context, IRubyObject self, Block aBlock) {
- return callAdapter.call(context, self, getReceiverNode().interpret(runtime, context, self, aBlock));
+ IRubyObject receiver = getReceiverNode().interpret(runtime, context, self, aBlock);
+ DynamicMethod method = getNamespacedMethod(runtime, context, self, receiver, aBlock);
+ if (method != null && !method.isUndefined()) {
+ return method.call(context, receiver, receiver.getMetaClass(), callAdapter.methodName);
+ }
+ return callAdapter.call(context, self, receiver);
}
- @Override
- public Node setIterNode(Node iterNode) {
- return new CallNoArgBlockNode(getPosition(), getReceiverNode(), getName(), getArgsNode(), (IterNode) iterNode);
+ public Node setIterNode(Node iterNode, ParserSupport support) {
+ if (support.getNamespaces().size() == 0) {
+ return new CallNoArgBlockNode(getPosition(), getReceiverNode(), getName(), getArgsNode(), (IterNode) iterNode);
+ }
+ return new CallNoArgBlockNode(getPosition(), getReceiverNode(), getName(), getArgsNode(), (IterNode) iterNode, namespaces);
}
@Override
diff --git a/src/org/jruby/ast/CallNode.java b/src/org/jruby/ast/CallNode.java
index 9111b99..856dac5 100644
--- a/src/org/jruby/ast/CallNode.java
+++ b/src/org/jruby/ast/CallNode.java
@@ -37,6 +37,8 @@ import java.util.List;
import org.jruby.Ruby;
import org.jruby.RubyArray;
import org.jruby.RubyClass;
+import org.jruby.RubyHash;
+import org.jruby.RubyModule;
import org.jruby.ast.types.INameNode;
import org.jruby.ast.visitor.NodeVisitor;
import org.jruby.evaluator.ASTInterpreter;
@@ -44,6 +46,7 @@ import org.jruby.exceptions.JumpException;
import org.jruby.internal.runtime.methods.DynamicMethod;
import org.jruby.javasupport.util.RuntimeHelpers;
import org.jruby.lexer.yacc.ISourcePosition;
+import org.jruby.parser.ParserSupport;
import org.jruby.runtime.Block;
import org.jruby.runtime.CallSite;
import org.jruby.runtime.CallType;
@@ -60,14 +63,15 @@ public class CallNode extends Node implements INameNode, IArgumentNode, BlockAcc
private Node argsNode;
protected Node iterNode;
public CallSite callAdapter;
+ protected List<Node> namespaces;
@Deprecated
public CallNode(ISourcePosition position, Node receiverNode, String name, Node argsNode) {
- this(position, receiverNode, name, argsNode, null);
+ this(position, receiverNode, name, argsNode, null, null);
}
public CallNode(ISourcePosition position, Node receiverNode, String name, Node argsNode,
- Node iterNode) {
+ Node iterNode, List<Node> namespaces) {
super(position);
assert receiverNode != null : "receiverNode is not null";
@@ -76,6 +80,23 @@ public class CallNode extends Node implements INameNode, IArgumentNode, BlockAcc
setArgsNode(argsNode);
this.iterNode = iterNode;
this.callAdapter = MethodIndex.getCallSite(name);
+ this.namespaces = namespaces;
+ }
+
+ protected DynamicMethod getNamespacedMethod(Ruby runtime, ThreadContext context, IRubyObject self, IRubyObject receiver, Block aBlock) {
+ DynamicMethod method = null;
+ if (namespaces != null) {
+ for (Node node : namespaces) {
+ IRubyObject namespace = ((RubyArray)node.interpret(runtime, context, self, aBlock)).eltInternal(0);
+ RubyModule nsModule = ((RubyModule)((RubyHash)namespace).keys().eltInternal(0));
+ RubyClass targetClass = (RubyClass)((RubyHash)namespace).rb_values().eltInternal(0);
+ if (targetClass == receiver.getMetaClass()) {
+ method = nsModule.searchMethod(callAdapter.methodName);
+ if (method != null && !method.isUndefined()) break;
+ }
+ }
+ }
+ return method;
}
public NodeType getNodeType() {
@@ -94,7 +115,7 @@ public class CallNode extends Node implements INameNode, IArgumentNode, BlockAcc
return iterNode;
}
- public Node setIterNode(Node iterNode) {
+ public Node setIterNode(Node iterNode, ParserSupport support) {
this.iterNode = iterNode;
// refresh call adapter, since it matters if this is iter-based or not
callAdapter = MethodIndex.getCallSite(callAdapter.methodName);
diff --git a/src/org/jruby/ast/CallOneArgBlockNode.java b/src/org/jruby/ast/CallOneArgBlockNode.java
index cc419de..69a2d52 100644
--- a/src/org/jruby/ast/CallOneArgBlockNode.java
+++ b/src/org/jruby/ast/CallOneArgBlockNode.java
@@ -32,7 +32,9 @@
***** END LICENSE BLOCK *****/
package org.jruby.ast;
+import java.util.List;
import org.jruby.Ruby;
+import org.jruby.internal.runtime.methods.DynamicMethod;
import org.jruby.javasupport.util.RuntimeHelpers;
import org.jruby.lexer.yacc.ISourcePosition;
import org.jruby.runtime.Block;
@@ -46,17 +48,31 @@ public final class CallOneArgBlockNode extends CallNode {
private Node arg1;
public CallOneArgBlockNode(ISourcePosition position, Node receiverNode, String name, ArrayNode args, IterNode iter) {
- super(position, receiverNode, name, args, iter);
+ super(position, receiverNode, name, args, iter, null);
assert args.size() == 1 : "args.size() is 1";
arg1 = args.get(0);
}
-
+
+ public CallOneArgBlockNode(ISourcePosition position, Node receiverNode, String name, ArrayNode args, IterNode iter, List<Node> namespaces) {
+ super(position, receiverNode, name, args, iter, namespaces);
+
+ assert args.size() == 1 : "args.size() is 1";
+
+ arg1 = args.get(0);
+ }
+
@Override
public IRubyObject interpret(Ruby runtime, ThreadContext context, IRubyObject self, Block aBlock) {
IRubyObject receiver = getReceiverNode().interpret(runtime, context, self, aBlock);
-
+
+ DynamicMethod method = getNamespacedMethod(runtime, context, self, receiver, aBlock);
+ if (method != null && !method.isUndefined()) {
+ return method.call(context, receiver, receiver.getMetaClass(), callAdapter.methodName,
+ arg1.interpret(runtime, context, self, aBlock),
+ RuntimeHelpers.getBlock(context, self, iterNode));
+ }
return callAdapter.call(context, self, receiver,
arg1.interpret(runtime, context, self, aBlock),
RuntimeHelpers.getBlock(context, self, iterNode));
diff --git a/src/org/jruby/ast/CallOneArgBlockPassNode.java b/src/org/jruby/ast/CallOneArgBlockPassNode.java
index 1488e64..c360748 100644
--- a/src/org/jruby/ast/CallOneArgBlockPassNode.java
+++ b/src/org/jruby/ast/CallOneArgBlockPassNode.java
@@ -32,7 +32,9 @@
***** END LICENSE BLOCK *****/
package org.jruby.ast;
+import java.util.List;
import org.jruby.Ruby;
+import org.jruby.internal.runtime.methods.DynamicMethod;
import org.jruby.javasupport.util.RuntimeHelpers;
import org.jruby.lexer.yacc.ISourcePosition;
import org.jruby.runtime.Block;
@@ -46,17 +48,29 @@ public final class CallOneArgBlockPassNode extends CallNode {
private Node arg1;
public CallOneArgBlockPassNode(ISourcePosition position, Node receiverNode, String name, ArrayNode args, BlockPassNode iter) {
- super(position, receiverNode, name, args, iter);
+ super(position, receiverNode, name, args, iter, null);
assert args.size() == 1 : "args.size() is 1";
arg1 = args.get(0);
}
-
+
+ public CallOneArgBlockPassNode(ISourcePosition position, Node receiverNode, String name, ArrayNode args, BlockPassNode iter, List<Node> namespaces) {
+ super(position, receiverNode, name, args, iter, namespaces);
+
+ assert args.size() == 1 : "args.size() is 1";
+
+ arg1 = args.get(0);
+ }
+
@Override
public IRubyObject interpret(Ruby runtime, ThreadContext context, IRubyObject self, Block aBlock) {
IRubyObject receiver = getReceiverNode().interpret(runtime, context, self, aBlock);
-
+
+ DynamicMethod method = getNamespacedMethod(runtime, context, self, receiver, aBlock);
+ if (method != null && !method.isUndefined()) {
+ return method.call(context, receiver, receiver.getMetaClass(), callAdapter.methodName, arg1.interpret(runtime, context, self, aBlock), RuntimeHelpers.getBlock(runtime, context, self, iterNode, aBlock));
+ }
return callAdapter.call(context, self, receiver,
arg1.interpret(runtime, context, self, aBlock),
RuntimeHelpers.getBlock(runtime, context, self, iterNode, aBlock));
diff --git a/src/org/jruby/ast/CallOneArgNode.java b/src/org/jruby/ast/CallOneArgNode.java
index 4b15628..2538b5a 100644
--- a/src/org/jruby/ast/CallOneArgNode.java
+++ b/src/org/jruby/ast/CallOneArgNode.java
@@ -32,8 +32,11 @@
***** END LICENSE BLOCK *****/
package org.jruby.ast;
+import java.util.List;
import org.jruby.Ruby;
+import org.jruby.internal.runtime.methods.DynamicMethod;
import org.jruby.lexer.yacc.ISourcePosition;
+import org.jruby.parser.ParserSupport;
import org.jruby.runtime.Block;
import org.jruby.runtime.ThreadContext;
import org.jruby.runtime.builtin.IRubyObject;
@@ -45,21 +48,35 @@ public final class CallOneArgNode extends CallNode {
private Node arg1;
public CallOneArgNode(ISourcePosition position, Node receiverNode, String name, ArrayNode args) {
- super(position, receiverNode, name, args, null);
+ super(position, receiverNode, name, args, null, null);
assert args.size() == 1 : "args.size() is 1";
arg1 = args.get(0);
}
-
+
+ public CallOneArgNode(ISourcePosition position, Node receiverNode, String name, ArrayNode args, List<Node> namespaces) {
+ super(position, receiverNode, name, args, null, namespaces);
+
+ assert args.size() == 1 : "args.size() is 1";
+
+ arg1 = args.get(0);
+ }
+
@Override
public IRubyObject interpret(Ruby runtime, ThreadContext context, IRubyObject self, Block aBlock) {
- return callAdapter.call(context, self, getReceiverNode().interpret(runtime, context, self, aBlock),
+ IRubyObject receiver = getReceiverNode().interpret(runtime, context, self, aBlock);
+ DynamicMethod method = getNamespacedMethod(runtime, context, self, receiver, aBlock);
+ if (method != null && !method.isUndefined()) {
+ return method.call(context, receiver, receiver.getMetaClass(), callAdapter.methodName,
+ arg1.interpret(runtime, context, self, aBlock));
+ }
+ return callAdapter.call(context, self, receiver,
arg1.interpret(runtime, context, self, aBlock));
}
@Override
- public Node setIterNode(Node iterNode) {
+ public Node setIterNode(Node iterNode, ParserSupport support) {
return new CallOneArgBlockNode(getPosition(), getReceiverNode(), getName(), (ArrayNode) getArgsNode(), (IterNode) iterNode);
}
}
diff --git a/src/org/jruby/ast/CallSpecialArgBlockNode.java b/src/org/jruby/ast/CallSpecialArgBlockNode.java
index fc10179..2a3d73f 100644
--- a/src/org/jruby/ast/CallSpecialArgBlockNode.java
+++ b/src/org/jruby/ast/CallSpecialArgBlockNode.java
@@ -32,8 +32,10 @@
***** END LICENSE BLOCK *****/
package org.jruby.ast;
+import java.util.List;
import org.jruby.Ruby;
import org.jruby.RubyArray;
+import org.jruby.internal.runtime.methods.DynamicMethod;
import org.jruby.javasupport.util.RuntimeHelpers;
import org.jruby.lexer.yacc.ISourcePosition;
import org.jruby.runtime.Block;
@@ -45,15 +47,40 @@ import org.jruby.runtime.builtin.IRubyObject;
*/
public final class CallSpecialArgBlockNode extends CallNode {
public CallSpecialArgBlockNode(ISourcePosition position, Node receiverNode, String name, Node args, IterNode iter) {
- super(position, receiverNode, name, args, iter);
+ super(position, receiverNode, name, args, iter, null);
}
-
+
+ public CallSpecialArgBlockNode(ISourcePosition position, Node receiverNode, String name, Node args, IterNode iter, List<Node> namespaces) {
+ super(position, receiverNode, name, args, iter, namespaces);
+ }
+
@Override
public IRubyObject interpret(Ruby runtime, ThreadContext context, IRubyObject self, Block aBlock) {
IRubyObject receiver = getReceiverNode().interpret(runtime, context, self, aBlock);
IRubyObject arg = getArgsNode().interpret(runtime, context, self, aBlock);
Block block = RuntimeHelpers.getBlock(context, self, iterNode);
+ DynamicMethod method = getNamespacedMethod(runtime, context, self, receiver, aBlock);
+ if (method != null && !method.isUndefined()) {
+ if (arg instanceof RubyArray) {
+ RubyArray nodes = (RubyArray) arg;
+
+ switch (nodes.size()) {
+ case 0:
+ return method.call(context, receiver, receiver.getMetaClass(), callAdapter.methodName, block);
+ case 1:
+ return method.call(context, receiver, receiver.getMetaClass(), callAdapter.methodName, nodes.eltInternal(0), block);
+ case 2:
+ return method.call(context, receiver, receiver.getMetaClass(), callAdapter.methodName, nodes.eltInternal(0), nodes.eltInternal(1), block);
+ case 3:
+ return method.call(context, receiver, receiver.getMetaClass(), callAdapter.methodName, nodes.eltInternal(0), nodes.eltInternal(1), nodes.eltInternal(2), block);
+ default:
+ return method.call(context, receiver, receiver.getMetaClass(), callAdapter.methodName, nodes.toJavaArrayMaybeUnsafe(), block);
+ }
+ }
+
+ return method.call(context, receiver, receiver.getMetaClass(), callAdapter.methodName, arg, block);
+ }
if (arg instanceof RubyArray) {
RubyArray nodes = (RubyArray) arg;
diff --git a/src/org/jruby/ast/CallSpecialArgBlockPassNode.java b/src/org/jruby/ast/CallSpecialArgBlockPassNode.java
index 1548ca0..00723b8 100644
--- a/src/org/jruby/ast/CallSpecialArgBlockPassNode.java
+++ b/src/org/jruby/ast/CallSpecialArgBlockPassNode.java
@@ -32,8 +32,10 @@
***** END LICENSE BLOCK *****/
package org.jruby.ast;
+import java.util.List;
import org.jruby.Ruby;
import org.jruby.RubyArray;
+import org.jruby.internal.runtime.methods.DynamicMethod;
import org.jruby.javasupport.util.RuntimeHelpers;
import org.jruby.lexer.yacc.ISourcePosition;
import org.jruby.runtime.Block;
@@ -45,15 +47,29 @@ import org.jruby.runtime.builtin.IRubyObject;
*/
public final class CallSpecialArgBlockPassNode extends CallNode {
public CallSpecialArgBlockPassNode(ISourcePosition position, Node receiverNode, String name, Node args, BlockPassNode iter) {
- super(position, receiverNode, name, args, iter);
+ super(position, receiverNode, name, args, iter, null);
}
-
+
+ public CallSpecialArgBlockPassNode(ISourcePosition position, Node receiverNode, String name, Node args, BlockPassNode iter, List<Node> namespaces) {
+ super(position, receiverNode, name, args, iter, namespaces);
+ }
+
@Override
public IRubyObject interpret(Ruby runtime, ThreadContext context, IRubyObject self, Block aBlock) {
IRubyObject receiver = getReceiverNode().interpret(runtime, context, self, aBlock);
IRubyObject arg = getArgsNode().interpret(runtime, context, self, aBlock);
Block block = RuntimeHelpers.getBlock(runtime, context, self, iterNode, aBlock);
+ DynamicMethod method = getNamespacedMethod(runtime, context, self, receiver, aBlock);
+ if (method != null && !method.isUndefined()) {
+ if (arg instanceof RubyArray) {
+ RubyArray nodes = (RubyArray) arg;
+ return method.call(context, receiver, receiver.getMetaClass(), callAdapter.methodName, nodes.toJavaArrayMaybeUnsafe(), block);
+ } else {
+ return method.call(context, receiver, receiver.getMetaClass(), callAdapter.methodName, arg, block);
+ }
+ }
+
if (arg instanceof RubyArray) {
RubyArray nodes = (RubyArray) arg;
diff --git a/src/org/jruby/ast/CallSpecialArgNode.java b/src/org/jruby/ast/CallSpecialArgNode.java
index 8e9833c..bbda4db 100644
--- a/src/org/jruby/ast/CallSpecialArgNode.java
+++ b/src/org/jruby/ast/CallSpecialArgNode.java
@@ -32,9 +32,12 @@
***** END LICENSE BLOCK *****/
package org.jruby.ast;
+import java.util.List;
import org.jruby.Ruby;
import org.jruby.RubyArray;
+import org.jruby.internal.runtime.methods.DynamicMethod;
import org.jruby.lexer.yacc.ISourcePosition;
+import org.jruby.parser.ParserSupport;
import org.jruby.runtime.Block;
import org.jruby.runtime.ThreadContext;
import org.jruby.runtime.builtin.IRubyObject;
@@ -44,11 +47,15 @@ import org.jruby.runtime.builtin.IRubyObject;
*/
public final class CallSpecialArgNode extends CallNode {
public CallSpecialArgNode(ISourcePosition position, Node receiverNode, String name, Node args) {
- super(position, receiverNode, name, args, null);
+ super(position, receiverNode, name, args, null, null);
}
-
+
+ public CallSpecialArgNode(ISourcePosition position, Node receiverNode, String name, Node args, List<Node> namespaces) {
+ super(position, receiverNode, name, args, null, namespaces);
+ }
+
@Override
- public Node setIterNode(Node iterNode) {
+ public Node setIterNode(Node iterNode, ParserSupport support) {
return new CallSpecialArgBlockNode(getPosition(), getReceiverNode(), getName(), getArgsNode(), (IterNode) iterNode);
}
@@ -56,10 +63,31 @@ public final class CallSpecialArgNode extends CallNode {
public IRubyObject interpret(Ruby runtime, ThreadContext context, IRubyObject self, Block aBlock) {
IRubyObject receiver = getReceiverNode().interpret(runtime, context, self, aBlock);
IRubyObject arg = getArgsNode().interpret(runtime, context, self, aBlock);
-
+
+ DynamicMethod method = getNamespacedMethod(runtime, context, self, receiver, aBlock);
+ if (method != null && !method.isUndefined()) {
+ if (arg instanceof RubyArray) {
+ RubyArray nodes = (RubyArray) arg;
+
+ switch (nodes.size()) {
+ case 0:
+ return method.call(context, receiver, receiver.getMetaClass(), callAdapter.methodName);
+ case 1:
+ return method.call(context, receiver, receiver.getMetaClass(), callAdapter.methodName, nodes.eltInternal(0));
+ case 2:
+ return method.call(context, receiver, receiver.getMetaClass(), callAdapter.methodName, nodes.eltInternal(0), nodes.eltInternal(1));
+ case 3:
+ return method.call(context, receiver, receiver.getMetaClass(), callAdapter.methodName, nodes.eltInternal(0), nodes.eltInternal(1), nodes.eltInternal(2));
+ default:
+ return method.call(context, receiver, receiver.getMetaClass(), callAdapter.methodName, nodes.toJavaArrayMaybeUnsafe());
+ }
+ }
+
+ return method.call(context, receiver, receiver.getMetaClass(), callAdapter.methodName, arg);
+ }
if (arg instanceof RubyArray) {
RubyArray nodes = (RubyArray) arg;
-
+
switch (nodes.size()) {
case 0:
return callAdapter.call(context, self, receiver);
@@ -73,7 +101,7 @@ public final class CallSpecialArgNode extends CallNode {
return callAdapter.call(context, self, receiver, nodes.toJavaArrayMaybeUnsafe());
}
}
-
+
return callAdapter.call(context, self, receiver, arg);
}
}
diff --git a/src/org/jruby/ast/CallThreeArgBlockNode.java b/src/org/jruby/ast/CallThreeArgBlockNode.java
index 3df06ef..2591556 100644
--- a/src/org/jruby/ast/CallThreeArgBlockNode.java
+++ b/src/org/jruby/ast/CallThreeArgBlockNode.java
@@ -32,7 +32,9 @@
***** END LICENSE BLOCK *****/
package org.jruby.ast;
+import java.util.List;
import org.jruby.Ruby;
+import org.jruby.internal.runtime.methods.DynamicMethod;
import org.jruby.javasupport.util.RuntimeHelpers;
import org.jruby.lexer.yacc.ISourcePosition;
import org.jruby.runtime.Block;
@@ -48,7 +50,7 @@ public final class CallThreeArgBlockNode extends CallNode {
private Node arg3;
public CallThreeArgBlockNode(ISourcePosition position, Node receiverNode, String name, ArrayNode args, IterNode iter) {
- super(position, receiverNode, name, args, iter);
+ super(position, receiverNode, name, args, iter, null);
assert args.size() == 3 : "args.size() is 3";
@@ -56,11 +58,29 @@ public final class CallThreeArgBlockNode extends CallNode {
arg2 = args.get(1);
arg3 = args.get(2);
}
+
+ public CallThreeArgBlockNode(ISourcePosition position, Node receiverNode, String name, ArrayNode args, IterNode iter, List<Node> namespaces) {
+ super(position, receiverNode, name, args, iter, namespaces);
+
+ assert args.size() == 3 : "args.size() is 3";
+
+ arg1 = args.get(0);
+ arg2 = args.get(1);
+ arg3 = args.get(2);
+ }
@Override
public IRubyObject interpret(Ruby runtime, ThreadContext context, IRubyObject self, Block aBlock) {
IRubyObject receiver = getReceiverNode().interpret(runtime, context, self, aBlock);
-
+
+ DynamicMethod method = getNamespacedMethod(runtime, context, self, receiver, aBlock);
+ if (method != null && !method.isUndefined()) {
+ return method.call(context, receiver, receiver.getMetaClass(), callAdapter.methodName,
+ arg1.interpret(runtime, context, self, aBlock),
+ arg2.interpret(runtime, context, self, aBlock),
+ arg3.interpret(runtime, context, self, aBlock),
+ RuntimeHelpers.getBlock(context, self, iterNode));
+ }
return callAdapter.callIter(context, self, receiver,
arg1.interpret(runtime, context, self, aBlock),
arg2.interpret(runtime, context, self, aBlock),
diff --git a/src/org/jruby/ast/CallThreeArgBlockPassNode.java b/src/org/jruby/ast/CallThreeArgBlockPassNode.java
index c603fe9..651a98a 100644
--- a/src/org/jruby/ast/CallThreeArgBlockPassNode.java
+++ b/src/org/jruby/ast/CallThreeArgBlockPassNode.java
@@ -32,7 +32,9 @@
***** END LICENSE BLOCK *****/
package org.jruby.ast;
+import java.util.List;
import org.jruby.Ruby;
+import org.jruby.internal.runtime.methods.DynamicMethod;
import org.jruby.javasupport.util.RuntimeHelpers;
import org.jruby.lexer.yacc.ISourcePosition;
import org.jruby.runtime.Block;
@@ -48,7 +50,7 @@ public final class CallThreeArgBlockPassNode extends CallNode {
private Node arg3;
public CallThreeArgBlockPassNode(ISourcePosition position, Node receiverNode, String name, ArrayNode args, BlockPassNode iter) {
- super(position, receiverNode, name, args, iter);
+ super(position, receiverNode, name, args, iter, null);
assert args.size() == 3 : "args.size() is 3";
@@ -56,11 +58,29 @@ public final class CallThreeArgBlockPassNode extends CallNode {
arg2 = args.get(1);
arg3 = args.get(2);
}
-
+
+ public CallThreeArgBlockPassNode(ISourcePosition position, Node receiverNode, String name, ArrayNode args, BlockPassNode iter, List<Node> namespaces) {
+ super(position, receiverNode, name, args, iter, namespaces);
+
+ assert args.size() == 3 : "args.size() is 3";
+
+ arg1 = args.get(0);
+ arg2 = args.get(1);
+ arg3 = args.get(2);
+ }
+
@Override
public IRubyObject interpret(Ruby runtime, ThreadContext context, IRubyObject self, Block aBlock) {
IRubyObject receiver = getReceiverNode().interpret(runtime, context, self, aBlock);
-
+
+ DynamicMethod method = getNamespacedMethod(runtime, context, self, receiver, aBlock);
+ if (method != null && !method.isUndefined()) {
+ return method.call(context, receiver, receiver.getMetaClass(), callAdapter.methodName,
+ arg1.interpret(runtime, context, self, aBlock),
+ arg2.interpret(runtime, context, self, aBlock),
+ arg3.interpret(runtime, context, self, aBlock),
+ RuntimeHelpers.getBlock(runtime, context, self, iterNode, aBlock));
+ }
return callAdapter.call(context, self, receiver,
arg1.interpret(runtime, context, self, aBlock),
arg2.interpret(runtime, context, self, aBlock),
diff --git a/src/org/jruby/ast/CallThreeArgNode.java b/src/org/jruby/ast/CallThreeArgNode.java
index f55b916..a174065 100644
--- a/src/org/jruby/ast/CallThreeArgNode.java
+++ b/src/org/jruby/ast/CallThreeArgNode.java
@@ -32,8 +32,11 @@
***** END LICENSE BLOCK *****/
package org.jruby.ast;
+import java.util.List;
import org.jruby.Ruby;
+import org.jruby.internal.runtime.methods.DynamicMethod;
import org.jruby.lexer.yacc.ISourcePosition;
+import org.jruby.parser.ParserSupport;
import org.jruby.runtime.Block;
import org.jruby.runtime.ThreadContext;
import org.jruby.runtime.builtin.IRubyObject;
@@ -47,7 +50,7 @@ public final class CallThreeArgNode extends CallNode {
private Node arg3;
public CallThreeArgNode(ISourcePosition position, Node receiverNode, String name, ArrayNode args) {
- super(position, receiverNode, name, args, null);
+ super(position, receiverNode, name, args, null, null);
assert args.size() == 3 : "args.size() is 3";
@@ -55,17 +58,36 @@ public final class CallThreeArgNode extends CallNode {
arg2 = args.get(1);
arg3 = args.get(2);
}
+
+ public CallThreeArgNode(ISourcePosition position, Node receiverNode, String name, ArrayNode args, List<Node> namespaces) {
+ super(position, receiverNode, name, args, null, namespaces);
+
+ assert args.size() == 3 : "args.size() is 3";
+
+ arg1 = args.get(0);
+ arg2 = args.get(1);
+ arg3 = args.get(2);
+ }
@Override
public IRubyObject interpret(Ruby runtime, ThreadContext context, IRubyObject self, Block aBlock) {
- return callAdapter.call(context, self, getReceiverNode().interpret(runtime, context, self, aBlock),
+ IRubyObject receiver = getReceiverNode().interpret(runtime, context, self, aBlock);
+
+ DynamicMethod method = getNamespacedMethod(runtime, context, self, receiver, aBlock);
+ if (method != null && !method.isUndefined()) {
+ return method.call(context, receiver, receiver.getMetaClass(), callAdapter.methodName,
+ arg1.interpret(runtime, context, self, aBlock),
+ arg2.interpret(runtime, context, self, aBlock),
+ arg3.interpret(runtime, context, self, aBlock));
+ }
+ return callAdapter.call(context, self, receiver,
arg1.interpret(runtime, context, self, aBlock),
arg2.interpret(runtime, context, self, aBlock),
arg3.interpret(runtime, context, self, aBlock));
}
@Override
- public Node setIterNode(Node iterNode) {
+ public Node setIterNode(Node iterNode, ParserSupport support) {
return new CallThreeArgBlockNode(getPosition(), getReceiverNode(), getName(), (ArrayNode) getArgsNode(), (IterNode) iterNode);
}
}
diff --git a/src/org/jruby/ast/CallTwoArgBlockNode.java b/src/org/jruby/ast/CallTwoArgBlockNode.java
index 5a28960..8d1293c 100644
--- a/src/org/jruby/ast/CallTwoArgBlockNode.java
+++ b/src/org/jruby/ast/CallTwoArgBlockNode.java
@@ -32,7 +32,9 @@
***** END LICENSE BLOCK *****/
package org.jruby.ast;
+import java.util.List;
import org.jruby.Ruby;
+import org.jruby.internal.runtime.methods.DynamicMethod;
import org.jruby.javasupport.util.RuntimeHelpers;
import org.jruby.lexer.yacc.ISourcePosition;
import org.jruby.runtime.Block;
@@ -47,20 +49,36 @@ public final class CallTwoArgBlockNode extends CallNode {
private Node arg2;
public CallTwoArgBlockNode(ISourcePosition position, Node receiverNode, String name, ArrayNode args, IterNode iter) {
- super(position, receiverNode, name, args, iter);
+ super(position, receiverNode, name, args, iter, null);
assert args.size() == 2 : "args.size() is 2";
arg1 = args.get(0);
arg2 = args.get(1);
}
+
+ public CallTwoArgBlockNode(ISourcePosition position, Node receiverNode, String name, ArrayNode args, IterNode iter, List<Node> namespaces) {
+ super(position, receiverNode, name, args, iter, namespaces);
+
+ assert args.size() == 2 : "args.size() is 2";
+
+ arg1 = args.get(0);
+ arg2 = args.get(1);
+ }
@Override
public IRubyObject interpret(Ruby runtime, ThreadContext context, IRubyObject self, Block aBlock) {
IRubyObject receiver = getReceiverNode().interpret(runtime, context, self, aBlock);
+ DynamicMethod method = getNamespacedMethod(runtime, context, self, receiver, aBlock);
+ if (method != null && !method.isUndefined()) {
+ return method.call(context, receiver, receiver.getMetaClass(), callAdapter.methodName,
+ arg1.interpret(runtime, context, self, aBlock),
+ arg2.interpret(runtime, context, self, aBlock),
+ RuntimeHelpers.getBlock(context, self, iterNode));
+ }
return callAdapter.callIter(context, self, receiver,
- arg1.interpret(runtime, context, self, aBlock),
+ arg1.interpret(runtime, context, self, aBlock),
arg2.interpret(runtime, context, self, aBlock),
RuntimeHelpers.getBlock(context, self, iterNode));
}
diff --git a/src/org/jruby/ast/CallTwoArgBlockPassNode.java b/src/org/jruby/ast/CallTwoArgBlockPassNode.java
index 366d5a9..778dca1 100644
--- a/src/org/jruby/ast/CallTwoArgBlockPassNode.java
+++ b/src/org/jruby/ast/CallTwoArgBlockPassNode.java
@@ -32,7 +32,9 @@
***** END LICENSE BLOCK *****/
package org.jruby.ast;
+import java.util.List;
import org.jruby.Ruby;
+import org.jruby.internal.runtime.methods.DynamicMethod;
import org.jruby.javasupport.util.RuntimeHelpers;
import org.jruby.lexer.yacc.ISourcePosition;
import org.jruby.runtime.Block;
@@ -47,20 +49,36 @@ public final class CallTwoArgBlockPassNode extends CallNode {
private Node arg2;
public CallTwoArgBlockPassNode(ISourcePosition position, Node receiverNode, String name, ArrayNode args, BlockPassNode iter) {
- super(position, receiverNode, name, args, iter);
+ super(position, receiverNode, name, args, iter, null);
assert args.size() == 2 : "args.size() is 2";
arg1 = args.get(0);
arg2 = args.get(1);
}
-
+
+ public CallTwoArgBlockPassNode(ISourcePosition position, Node receiverNode, String name, ArrayNode args, BlockPassNode iter, List<Node> namespaces) {
+ super(position, receiverNode, name, args, iter, namespaces);
+
+ assert args.size() == 2 : "args.size() is 2";
+
+ arg1 = args.get(0);
+ arg2 = args.get(1);
+ }
+
@Override
public IRubyObject interpret(Ruby runtime, ThreadContext context, IRubyObject self, Block aBlock) {
IRubyObject receiver = getReceiverNode().interpret(runtime, context, self, aBlock);
-
+
+ DynamicMethod method = getNamespacedMethod(runtime, context, self, receiver, aBlock);
+ if (method != null && !method.isUndefined()) {
+ return method.call(context, receiver, receiver.getMetaClass(), callAdapter.methodName,
+ arg1.interpret(runtime, context, self, aBlock),
+ arg2.interpret(runtime, context, self, aBlock),
+ RuntimeHelpers.getBlock(runtime, context, self, iterNode, aBlock));
+ }
return callAdapter.call(context, self, receiver,
- arg1.interpret(runtime, context, self, aBlock),
+ arg1.interpret(runtime, context, self, aBlock),
arg2.interpret(runtime, context, self, aBlock),
RuntimeHelpers.getBlock(runtime, context, self, iterNode, aBlock));
}
diff --git a/src/org/jruby/ast/CallTwoArgNode.java b/src/org/jruby/ast/CallTwoArgNode.java
index 7128c9b..2116519 100644
--- a/src/org/jruby/ast/CallTwoArgNode.java
+++ b/src/org/jruby/ast/CallTwoArgNode.java
@@ -32,8 +32,11 @@
***** END LICENSE BLOCK *****/
package org.jruby.ast;
+import java.util.List;
import org.jruby.Ruby;
+import org.jruby.internal.runtime.methods.DynamicMethod;
import org.jruby.lexer.yacc.ISourcePosition;
+import org.jruby.parser.ParserSupport;
import org.jruby.runtime.Block;
import org.jruby.runtime.ThreadContext;
import org.jruby.runtime.builtin.IRubyObject;
@@ -46,23 +49,39 @@ public final class CallTwoArgNode extends CallNode {
private Node arg2;
public CallTwoArgNode(ISourcePosition position, Node receiverNode, String name, ArrayNode args) {
- super(position, receiverNode, name, args, null);
+ super(position, receiverNode, name, args, null, null);
assert args.size() == 2 : "args.size() is 2";
arg1 = args.get(0);
arg2 = args.get(1);
}
+
+ public CallTwoArgNode(ISourcePosition position, Node receiverNode, String name, ArrayNode args, List<Node> namespaces) {
+ super(position, receiverNode, name, args, null, namespaces);
+
+ assert args.size() == 2 : "args.size() is 2";
+
+ arg1 = args.get(0);
+ arg2 = args.get(1);
+ }
@Override
public IRubyObject interpret(Ruby runtime, ThreadContext context, IRubyObject self, Block aBlock) {
- return callAdapter.call(context, self, getReceiverNode().interpret(runtime, context, self, aBlock),
+ IRubyObject receiver = getReceiverNode().interpret(runtime, context, self, aBlock);
+ DynamicMethod method = getNamespacedMethod(runtime, context, self, receiver, aBlock);
+ if (method != null && !method.isUndefined()) {
+ return method.call(context, receiver, receiver.getMetaClass(), callAdapter.methodName,
+ arg1.interpret(runtime, context, self, aBlock),
+ arg2.interpret(runtime, context, self, aBlock));
+ }
+ return callAdapter.call(context, self, receiver,
arg1.interpret(runtime, context, self, aBlock),
arg2.interpret(runtime, context, self, aBlock));
}
@Override
- public Node setIterNode(Node iterNode) {
+ public Node setIterNode(Node iterNode, ParserSupport support) {
return new CallTwoArgBlockNode(getPosition(), getReceiverNode(), getName(), (ArrayNode) getArgsNode(), (IterNode) iterNode);
}
}
diff --git a/src/org/jruby/ast/FCallManyArgsNode.java b/src/org/jruby/ast/FCallManyArgsNode.java
index f83ee5f..8fdbe6d 100644
--- a/src/org/jruby/ast/FCallManyArgsNode.java
+++ b/src/org/jruby/ast/FCallManyArgsNode.java
@@ -35,6 +35,7 @@ package org.jruby.ast;
import org.jruby.Ruby;
import org.jruby.ast.types.INameNode;
import org.jruby.lexer.yacc.ISourcePosition;
+import org.jruby.parser.ParserSupport;
import org.jruby.runtime.Block;
import org.jruby.runtime.ThreadContext;
import org.jruby.runtime.builtin.IRubyObject;
@@ -49,7 +50,7 @@ public class FCallManyArgsNode extends FCallNode implements INameNode, IArgument
}
@Override
- public Node setIterNode(Node iterNode) {
+ public Node setIterNode(Node iterNode, ParserSupport support) {
return new FCallManyArgsBlockNode(getPosition(), getName(), getArgsNode(), (IterNode) iterNode);
}
diff --git a/src/org/jruby/ast/FCallNoArgNode.java b/src/org/jruby/ast/FCallNoArgNode.java
index 76404df..cf8e559 100644
--- a/src/org/jruby/ast/FCallNoArgNode.java
+++ b/src/org/jruby/ast/FCallNoArgNode.java
@@ -7,6 +7,7 @@ package org.jruby.ast;
import org.jruby.Ruby;
import org.jruby.lexer.yacc.ISourcePosition;
+import org.jruby.parser.ParserSupport;
import org.jruby.runtime.Block;
import org.jruby.runtime.ThreadContext;
import org.jruby.runtime.builtin.IRubyObject;
@@ -32,7 +33,7 @@ public class FCallNoArgNode extends FCallNode {
}
@Override
- public Node setIterNode(Node iterNode) {
+ public Node setIterNode(Node iterNode, ParserSupport support) {
return new FCallNoArgBlockNode(getPosition(), getName(), getArgsNode(), (IterNode) iterNode);
}
}
diff --git a/src/org/jruby/ast/FCallNode.java b/src/org/jruby/ast/FCallNode.java
index 8c9752d..effa85c 100644
--- a/src/org/jruby/ast/FCallNode.java
+++ b/src/org/jruby/ast/FCallNode.java
@@ -38,6 +38,7 @@ import org.jruby.ast.types.INameNode;
import org.jruby.ast.visitor.NodeVisitor;
import org.jruby.evaluator.ASTInterpreter;
import org.jruby.lexer.yacc.ISourcePosition;
+import org.jruby.parser.ParserSupport;
import org.jruby.runtime.Block;
import org.jruby.runtime.CallSite;
import org.jruby.runtime.MethodIndex;
@@ -83,7 +84,7 @@ public class FCallNode extends Node implements INameNode, IArgumentNode, BlockAc
return iterNode;
}
- public Node setIterNode(Node iterNode) {
+ public Node setIterNode(Node iterNode, ParserSupport support) {
this.iterNode = iterNode;
callAdapter = MethodIndex.getFunctionalCallSite(callAdapter.methodName);
diff --git a/src/org/jruby/ast/FCallOneArgNode.java b/src/org/jruby/ast/FCallOneArgNode.java
index 64d8bae..1321a60 100644
--- a/src/org/jruby/ast/FCallOneArgNode.java
+++ b/src/org/jruby/ast/FCallOneArgNode.java
@@ -7,6 +7,7 @@ package org.jruby.ast;
import org.jruby.Ruby;
import org.jruby.lexer.yacc.ISourcePosition;
+import org.jruby.parser.ParserSupport;
import org.jruby.runtime.Block;
import org.jruby.runtime.ThreadContext;
import org.jruby.runtime.builtin.IRubyObject;
@@ -27,7 +28,7 @@ public class FCallOneArgNode extends FCallNode {
}
@Override
- public Node setIterNode(Node iterNode) {
+ public Node setIterNode(Node iterNode, ParserSupport support) {
return new FCallOneArgBlockNode(getPosition(), getName(), (ArrayNode) getArgsNode(), (IterNode) iterNode);
}
diff --git a/src/org/jruby/ast/FCallSpecialArgNode.java b/src/org/jruby/ast/FCallSpecialArgNode.java
index 29c8de7..d9af48d 100644
--- a/src/org/jruby/ast/FCallSpecialArgNode.java
+++ b/src/org/jruby/ast/FCallSpecialArgNode.java
@@ -8,6 +8,7 @@ package org.jruby.ast;
import org.jruby.Ruby;
import org.jruby.RubyArray;
import org.jruby.lexer.yacc.ISourcePosition;
+import org.jruby.parser.ParserSupport;
import org.jruby.runtime.Block;
import org.jruby.runtime.ThreadContext;
import org.jruby.runtime.builtin.IRubyObject;
@@ -21,7 +22,7 @@ public class FCallSpecialArgNode extends FCallNode {
}
@Override
- public Node setIterNode(Node iterNode) {
+ public Node setIterNode(Node iterNode, ParserSupport support) {
return new FCallSpecialArgBlockNode(getPosition(), getName(), getArgsNode(), (IterNode) iterNode);
}
diff --git a/src/org/jruby/ast/FCallThreeArgNode.java b/src/org/jruby/ast/FCallThreeArgNode.java
index e1b0f91..f15da38 100644
--- a/src/org/jruby/ast/FCallThreeArgNode.java
+++ b/src/org/jruby/ast/FCallThreeArgNode.java
@@ -7,6 +7,7 @@ package org.jruby.ast;
import org.jruby.Ruby;
import org.jruby.lexer.yacc.ISourcePosition;
+import org.jruby.parser.ParserSupport;
import org.jruby.runtime.Block;
import org.jruby.runtime.ThreadContext;
import org.jruby.runtime.builtin.IRubyObject;
@@ -31,7 +32,7 @@ public class FCallThreeArgNode extends FCallNode {
}
@Override
- public Node setIterNode(Node iterNode) {
+ public Node setIterNode(Node iterNode, ParserSupport support) {
return new FCallThreeArgBlockNode(getPosition(), getName(), (ArrayNode) getArgsNode(), (IterNode) iterNode);
}
diff --git a/src/org/jruby/ast/FCallTwoArgNode.java b/src/org/jruby/ast/FCallTwoArgNode.java
index 4635dd2..5b38ef7 100644
--- a/src/org/jruby/ast/FCallTwoArgNode.java
+++ b/src/org/jruby/ast/FCallTwoArgNode.java
@@ -7,6 +7,7 @@ package org.jruby.ast;
import org.jruby.Ruby;
import org.jruby.lexer.yacc.ISourcePosition;
+import org.jruby.parser.ParserSupport;
import org.jruby.runtime.Block;
import org.jruby.runtime.ThreadContext;
import org.jruby.runtime.builtin.IRubyObject;
@@ -29,7 +30,7 @@ public class FCallTwoArgNode extends FCallNode {
}
@Override
- public Node setIterNode(Node iterNode) {
+ public Node setIterNode(Node iterNode, ParserSupport support) {
return new FCallTwoArgBlockNode(getPosition(), getName(), (ArrayNode) getArgsNode(), (IterNode) iterNode);
}
diff --git a/src/org/jruby/ast/SuperNode.java b/src/org/jruby/ast/SuperNode.java
index 44b270f..7026226 100644
--- a/src/org/jruby/ast/SuperNode.java
+++ b/src/org/jruby/ast/SuperNode.java
@@ -39,6 +39,7 @@ import org.jruby.ast.visitor.NodeVisitor;
import org.jruby.evaluator.ASTInterpreter;
import org.jruby.javasupport.util.RuntimeHelpers;
import org.jruby.lexer.yacc.ISourcePosition;
+import org.jruby.parser.ParserSupport;
import org.jruby.runtime.Block;
import org.jruby.runtime.ThreadContext;
import org.jruby.runtime.builtin.IRubyObject;
@@ -88,7 +89,7 @@ public class SuperNode extends Node implements BlockAcceptingNode {
return iterNode;
}
- public Node setIterNode(Node iterNode) {
+ public Node setIterNode(Node iterNode, ParserSupport support) {
this.iterNode = iterNode;
return this;
diff --git a/src/org/jruby/ast/ZSuperNode.java b/src/org/jruby/ast/ZSuperNode.java
index b234039..37e7b9a 100644
--- a/src/org/jruby/ast/ZSuperNode.java
+++ b/src/org/jruby/ast/ZSuperNode.java
@@ -40,6 +40,7 @@ import org.jruby.ast.visitor.NodeVisitor;
import org.jruby.evaluator.ASTInterpreter;
import org.jruby.javasupport.util.RuntimeHelpers;
import org.jruby.lexer.yacc.ISourcePosition;
+import org.jruby.parser.ParserSupport;
import org.jruby.runtime.Arity;
import org.jruby.runtime.Block;
import org.jruby.runtime.ThreadContext;
@@ -82,7 +83,7 @@ public class ZSuperNode extends Node implements IArityNode, BlockAcceptingNode {
return iterNode;
}
- public Node setIterNode(Node iterNode) {
+ public Node setIterNode(Node iterNode, ParserSupport support) {
this.iterNode = iterNode;
return this;
diff --git a/src/org/jruby/parser/DefaultRubyParser.java b/src/org/jruby/parser/DefaultRubyParser.java
index 03d56c4..f0037b4 100644
--- a/src/org/jruby/parser/DefaultRubyParser.java
+++ b/src/org/jruby/parser/DefaultRubyParser.java
@@ -3423,7 +3423,7 @@ public Object case341_line1266(Object yyVal, Object[] yyVals, int yyTop) {
if (((BlockAcceptingNode)yyVals[-1+yyTop]).getIterNode() instanceof BlockPassNode) {
throw new SyntaxException(PID.BLOCK_ARG_AND_BLOCK_GIVEN, getPosition(((Node)yyVals[-1+yyTop])), "Both block arg and actual block given.");
}
- yyVal = ((BlockAcceptingNode)yyVals[-1+yyTop]).setIterNode(((IterNode)yyVals[0+yyTop]));
+ yyVal = ((BlockAcceptingNode)yyVals[-1+yyTop]).setIterNode(((IterNode)yyVals[0+yyTop]), support);
((Node)yyVal).setPosition(support.union(((Node)yyVals[-1+yyTop]), ((IterNode)yyVals[0+yyTop])));
return yyVal;
}
@@ -3603,7 +3603,7 @@ public Object case290_line1088(Object yyVal, Object[] yyVals, int yyTop) {
((BlockAcceptingNode)yyVals[-1+yyTop]).getIterNode() instanceof BlockPassNode) {
throw new SyntaxException(PID.BLOCK_ARG_AND_BLOCK_GIVEN, getPosition(((Node)yyVals[-1+yyTop])), "Both block arg and actual block given.");
}
- yyVal = ((BlockAcceptingNode)yyVals[-1+yyTop]).setIterNode(((IterNode)yyVals[0+yyTop]));
+ yyVal = ((BlockAcceptingNode)yyVals[-1+yyTop]).setIterNode(((IterNode)yyVals[0+yyTop]), support);
((Node)yyVal).setPosition(support.union(((Node)yyVals[-1+yyTop]), ((IterNode)yyVals[0+yyTop])));
return yyVal;
}
diff --git a/src/org/jruby/parser/ParserSupport.java b/src/org/jruby/parser/ParserSupport.java
index f3d9b97..e497670 100644
--- a/src/org/jruby/parser/ParserSupport.java
+++ b/src/org/jruby/parser/ParserSupport.java
@@ -35,6 +35,8 @@
***** END LICENSE BLOCK *****/
package org.jruby.parser;
+import java.util.ArrayList;
+import java.util.List;
import org.jruby.ast.AndNode;
import org.jruby.ast.ArgsPreOneArgNode;
import org.jruby.ast.ArgsPreTwoArgNode;
@@ -182,6 +184,8 @@ public class ParserSupport {
private ParserConfiguration configuration;
private RubyParserResult result;
+ private List namespaces = new ArrayList();
+
public void reset() {
inSingleton = 0;
inDefinition = false;
@@ -192,6 +196,10 @@ public class ParserSupport {
throw new SyntaxException(PID.DUBY_EXTENSIONS_OFF, position, "Duby extensions not configured");
}
}
+
+ public List getNamespaces() {
+ return namespaces;
+ }
public StaticScope getCurrentScope() {
return currentScope;
@@ -920,10 +928,16 @@ public class ParserSupport {
ISourcePosition position = union(receiver, name);
if (receiver == null) receiver = NilImplicitNode.NIL;
-
- if (iter != null) return new CallNoArgBlockNode(position, receiver, (String) name.getValue(), iter);
-
- return new CallNoArgNode(position, receiver, (String) name.getValue());
+
+ if (namespaces.size() > 0) {
+ if (iter != null) return new CallNoArgBlockNode(position, receiver, (String) name.getValue(), iter, namespaces);
+
+ return new CallNoArgNode(position, receiver, (String) name.getValue(), namespaces);
+ } else {
+ if (iter != null) return new CallNoArgBlockNode(position, receiver, (String) name.getValue(), iter);
+
+ return new CallNoArgNode(position, receiver, (String) name.getValue());
+ }
}
private Node new_call_complexargs(Node receiver, Token name, Node args, Node iter) {
@@ -936,9 +950,15 @@ public class ParserSupport {
return new_call_blockpass(receiver, name, (BlockPassNode) args);
}
- if (iter != null) return new CallSpecialArgBlockNode(union(receiver, args), receiver,(String) name.getValue(), args, (IterNode) iter);
+ if (namespaces.size() == 0) {
+ if (iter != null) return new CallSpecialArgBlockNode(union(receiver, args), receiver,(String) name.getValue(), args, (IterNode) iter);
- return new CallSpecialArgNode(union(receiver, args), receiver, (String) name.getValue(), args);
+ return new CallSpecialArgNode(union(receiver, args), receiver, (String) name.getValue(), args);
+ } else {
+ if (iter != null) return new CallSpecialArgBlockNode(union(receiver, args), receiver,(String) name.getValue(), args, (IterNode) iter, namespaces);
+
+ return new CallSpecialArgNode(union(receiver, args), receiver, (String) name.getValue(), args, namespaces);
+ }
}
private Node new_call_blockpass(Node receiver, Token operation, BlockPassNode blockPass) {
@@ -946,21 +966,39 @@ public class ParserSupport {
String name = (String) operation.getValue();
Node args = blockPass.getArgsNode();
- if (args == null) return new CallNoArgBlockPassNode(position, receiver, name, args, blockPass);
- if (!(args instanceof ArrayNode)) return new CallSpecialArgBlockPassNode(position, receiver, name, args, blockPass);
-
- switch (((ArrayNode) args).size()) {
- case 0: // foo()
- return new CallNoArgBlockPassNode(position, receiver, name, args, blockPass);
- case 1:
- return new CallOneArgBlockPassNode(position, receiver, name, (ArrayNode) args, blockPass);
- case 2:
- return new CallTwoArgBlockPassNode(position, receiver, name, (ArrayNode) args, blockPass);
- case 3:
- return new CallThreeArgBlockPassNode(position, receiver, name, (ArrayNode) args, blockPass);
- default:
- return new CallManyArgsBlockPassNode(position, receiver, name, args, blockPass);
- }
+ if (namespaces.size() == 0) {
+ if (args == null) return new CallNoArgBlockPassNode(position, receiver, name, args, blockPass);
+ if (!(args instanceof ArrayNode)) return new CallSpecialArgBlockPassNode(position, receiver, name, args, blockPass);
+
+ switch (((ArrayNode) args).size()) {
+ case 0: // foo()
+ return new CallNoArgBlockPassNode(position, receiver, name, args, blockPass);
+ case 1:
+ return new CallOneArgBlockPassNode(position, receiver, name, (ArrayNode) args, blockPass);
+ case 2:
+ return new CallTwoArgBlockPassNode(position, receiver, name, (ArrayNode) args, blockPass);
+ case 3:
+ return new CallThreeArgBlockPassNode(position, receiver, name, (ArrayNode) args, blockPass);
+ default:
+ return new CallManyArgsBlockPassNode(position, receiver, name, args, blockPass);
+ }
+ } else {
+ if (args == null) return new CallNoArgBlockPassNode(position, receiver, name, args, blockPass, namespaces);
+ if (!(args instanceof ArrayNode)) return new CallSpecialArgBlockPassNode(position, receiver, name, args, blockPass, namespaces);
+
+ switch (((ArrayNode) args).size()) {
+ case 0: // foo()
+ return new CallNoArgBlockPassNode(position, receiver, name, args, blockPass, namespaces);
+ case 1:
+ return new CallOneArgBlockPassNode(position, receiver, name, (ArrayNode) args, blockPass, namespaces);
+ case 2:
+ return new CallTwoArgBlockPassNode(position, receiver, name, (ArrayNode) args, blockPass, namespaces);
+ case 3:
+ return new CallThreeArgBlockPassNode(position, receiver, name, (ArrayNode) args, blockPass, namespaces);
+ default:
+ return new CallManyArgsBlockPassNode(position, receiver, name, args, blockPass, namespaces);
+ }
+ }
}
public Node new_call(Node receiver, Token name, Node argsNode, Node iter) {
@@ -969,27 +1007,52 @@ public class ParserSupport {
ArrayNode args = (ArrayNode) argsNode;
- switch (args.size()) {
- case 0:
- if (iter != null) return new CallNoArgBlockNode(union(receiver, args), receiver, (String) name.getValue(), args, (IterNode) iter);
-
- return new CallNoArgNode(union(receiver, args), receiver, args, (String) name.getValue());
- case 1:
- if (iter != null) return new CallOneArgBlockNode(union(receiver, args), receiver, (String) name.getValue(), args, (IterNode) iter);
-
- return new CallOneArgNode(union(receiver, args), receiver, (String) name.getValue(), args);
- case 2:
- if (iter != null) return new CallTwoArgBlockNode(union(receiver, args), receiver, (String) name.getValue(), args, (IterNode) iter);
-
- return new CallTwoArgNode(union(receiver, args), receiver, (String) name.getValue(), args);
- case 3:
- if (iter != null) return new CallThreeArgBlockNode(union(receiver, args), receiver, (String) name.getValue(), args, (IterNode) iter);
-
- return new CallThreeArgNode(union(receiver, args), receiver, (String) name.getValue(), args);
- default:
- if (iter != null) return new CallManyArgsBlockNode(union(receiver, args), receiver, (String) name.getValue(), args, (IterNode) iter);
+ if (namespaces.size() == 0) {
+ switch (args.size()) {
+ case 0:
+ if (iter != null) return new CallNoArgBlockNode(union(receiver, args), receiver, (String) name.getValue(), args, (IterNode) iter);
+
+ return new CallNoArgNode(union(receiver, args), receiver, args, (String) name.getValue());
+ case 1:
+ if (iter != null) return new CallOneArgBlockNode(union(receiver, args), receiver, (String) name.getValue(), args, (IterNode) iter);
+
+ return new CallOneArgNode(union(receiver, args), receiver, (String) name.getValue(), args);
+ case 2:
+ if (iter != null) return new CallTwoArgBlockNode(union(receiver, args), receiver, (String) name.getValue(), args, (IterNode) iter);
+
+ return new CallTwoArgNode(union(receiver, args), receiver, (String) name.getValue(), args);
+ case 3:
+ if (iter != null) return new CallThreeArgBlockNode(union(receiver, args), receiver, (String) name.getValue(), args, (IterNode) iter);
- return new CallManyArgsNode(union(receiver, args), receiver, (String) name.getValue(), args);
+ return new CallThreeArgNode(union(receiver, args), receiver, (String) name.getValue(), args);
+ default:
+ if (iter != null) return new CallManyArgsBlockNode(union(receiver, args), receiver, (String) name.getValue(), args, (IterNode) iter);
+
+ return new CallManyArgsNode(union(receiver, args), receiver, (String) name.getValue(), args);
+ }
+ } else {
+ switch (args.size()) {
+ case 0:
+ if (iter != null) return new CallNoArgBlockNode(union(receiver, args), receiver, (String) name.getValue(), args, (IterNode) iter, namespaces);
+
+ return new CallNoArgNode(union(receiver, args), receiver, args, (String) name.getValue(), namespaces);
+ case 1:
+ if (iter != null) return new CallOneArgBlockNode(union(receiver, args), receiver, (String) name.getValue(), args, (IterNode) iter, namespaces);
+
+ return new CallOneArgNode(union(receiver, args), receiver, (String) name.getValue(), args, namespaces);
+ case 2:
+ if (iter != null) return new CallTwoArgBlockNode(union(receiver, args), receiver, (String) name.getValue(), args, (IterNode) iter, namespaces);
+
+ return new CallTwoArgNode(union(receiver, args), receiver, (String) name.getValue(), args, namespaces);
+ case 3:
+ if (iter != null) return new CallThreeArgBlockNode(union(receiver, args), receiver, (String) name.getValue(), args, (IterNode) iter, namespaces);
+
+ return new CallThreeArgNode(union(receiver, args), receiver, (String) name.getValue(), args, namespaces);
+ default:
+ if (iter != null) return new CallManyArgsBlockNode(union(receiver, args), receiver, (String) name.getValue(), args, (IterNode) iter, namespaces);
+
+ return new CallManyArgsNode(union(receiver, args), receiver, (String) name.getValue(), args, namespaces);
+ }
}
}
@@ -1014,6 +1077,14 @@ public class ParserSupport {
private Node new_fcall_simpleargs(Token operation, ArrayNode args, Node iter) {
String name = (String) operation.getValue();
+
+ // it if's a "using" call add a namespace and return a nil node
+ if (name.equals("using")) {
+ namespaces.add(args);
+ return new NilNode(union(operation, args));
+ }
+
+ // otherwise, if we have a namespace, pass it into the FCall
switch (args.size()) {
case 0: // foo()
diff --git a/src/org/jruby/parser/Ruby19Parser.java b/src/org/jruby/parser/Ruby19Parser.java
index dd64f37..865473b 100644
--- a/src/org/jruby/parser/Ruby19Parser.java
+++ b/src/org/jruby/parser/Ruby19Parser.java
@@ -2730,7 +2730,7 @@ public Object case282_line1092(Object yyVal, Object[] yyVals, int yyTop) {
((BlockAcceptingNode)yyVals[-1+yyTop]).getIterNode() instanceof BlockPassNode) {
throw new SyntaxException(PID.BLOCK_ARG_AND_BLOCK_GIVEN, getPosition(((Node)yyVals[-1+yyTop])), "Both block arg and actual block given.");
}
- yyVal = ((BlockAcceptingNode)yyVals[-1+yyTop]).setIterNode(((IterNode)yyVals[0+yyTop]));
+ yyVal = ((BlockAcceptingNode)yyVals[-1+yyTop]).setIterNode(((IterNode)yyVals[0+yyTop]), support);
((Node)yyVal).setPosition(support.union(((Node)yyVals[-1+yyTop]), ((IterNode)yyVals[0+yyTop])));
return yyVal;
}
@@ -3307,7 +3307,7 @@ public Object case372_line1401(Object yyVal, Object[] yyVals, int yyTop) {
if (((BlockAcceptingNode)yyVals[-1+yyTop]).getIterNode() instanceof BlockPassNode) {
throw new SyntaxException(PID.BLOCK_ARG_AND_BLOCK_GIVEN, getPosition(((Node)yyVals[-1+yyTop])), "Both block arg and actual block given.");
}
- yyVal = ((BlockAcceptingNode)yyVals[-1+yyTop]).setIterNode(((IterNode)yyVals[0+yyTop]));
+ yyVal = ((BlockAcceptingNode)yyVals[-1+yyTop]).setIterNode(((IterNode)yyVals[0+yyTop]), support);
((Node)yyVal).setPosition(support.union(((Node)yyVals[-1+yyTop]), ((IterNode)yyVals[0+yyTop])));
return yyVal;
}
namespace_spec.rb
(598 Bytes, text/x-ruby)
module Namespace
def to_s
'my string'
end
def to_i(x)
42
end
def each
[1,2,3].each {|i| yield i}
end
end
describe "A simple namespace" do
it 'applies its methods only to designated classes' do
c = Class.new
c.class_eval "
using Namespace => String
def foo; 'hello'.to_s; end
def bar; '50'.to_i(16); end
def baz; i = 0; 'goodbye'.each {|j| i += j}; i; end
def quux; 42.to_s; end
"
c_obj = c.new
c_obj.foo.should == 'my string'
c_obj.bar.should == 42
c_obj.baz.should == 6
c_obj.quux.should == '42'
end
end