Followup on dc0b53f: use a disambiguated method name

jruby · Feb 7, 2016 · c7b2699 · c7b2699
1 parent dc0b53f
commit c7b2699
Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/core/src/main/java/org/jruby/ir/instructions/YieldInstr.java b/core/src/main/java/org/jruby/ir/instructions/YieldInstr.java
@@ -77,7 +77,7 @@ public Object interpret(ThreadContext context, StaticScope currScope, DynamicSco
             if (unwrapArray && yieldOp instanceof Array && ((Array)yieldOp).size() > 1) {
                 // Special case this path!
                 // Don't build a RubyArray.
-                return blk.yieldArray(context, self, ((Array)yieldOp).retrieveArrayElts(context, self, currScope, currDynScope, temp));
+                return blk.yieldValues(context, self, ((Array)yieldOp).retrieveArrayElts(context, self, currScope, currDynScope, temp));
             } else {
                 IRubyObject yieldVal = (IRubyObject) yieldOp.retrieve(context, self, currScope, currDynScope, temp);
                 return IRRuntimeHelpers.yield(context, blk, yieldVal, unwrapArray);

diff --git a/core/src/main/java/org/jruby/runtime/Block.java b/core/src/main/java/org/jruby/runtime/Block.java
@@ -178,7 +178,7 @@ public IRubyObject yieldArray(ThreadContext context, IRubyObject value, IRubyObj
         return body.yield(context, this, args, self);
     }
 
-    public IRubyObject yieldArray(ThreadContext context, IRubyObject self, IRubyObject[] args) {
+    public IRubyObject yieldValues(ThreadContext context, IRubyObject self, IRubyObject[] args) {
         return body.yield(context, this, args, self);
     }