[Truffle] Refactoring ReturnEnumeratorIfNoBlockNode arguments unshift…

… into RubyArguments method.
jruby · Mar 19, 2015 · ab90f79 · ab90f79 · chrisseaton · Mar 19, 2015
1 parent a536f0f
commit ab90f79
Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/core/ReturnEnumeratorIfNoBlockNode.java b/truffle/src/main/java/org/jruby/truffle/nodes/core/ReturnEnumeratorIfNoBlockNode.java
@@ -34,7 +34,7 @@ public Object execute(VirtualFrame frame) {
                 toEnumNode = insert(DispatchHeadNodeFactory.createMethodCall(getContext()));
             }
 
-            return toEnumNode.call(frame, RubyArguments.getSelf(frame.getArguments()), "to_enum", null, unshift(getContext().getSymbolTable().getSymbol(methodName), RubyArguments.extractUserArguments(frame.getArguments())));
+            return toEnumNode.call(frame, RubyArguments.getSelf(frame.getArguments()), "to_enum", null, RubyArguments.extractUserArgumentsWithUnshift(getContext().getSymbolTable().getSymbol(methodName), frame.getArguments()));
 
         } else {
 
@@ -43,12 +43,4 @@ public Object execute(VirtualFrame frame) {
         }
     }
 
-    private static <T> T[] unshift(T first, T[] array) {
-        final int length = array.length;
-        final T[] result = Arrays.copyOf(array, length + 1);
-        System.arraycopy(array, 0, result, 1, length);
-        result[0] = first;
-        return result;
-    }
-
 }
diff --git a/truffle/src/main/java/org/jruby/truffle/runtime/RubyArguments.java b/truffle/src/main/java/org/jruby/truffle/runtime/RubyArguments.java
@@ -57,6 +57,12 @@ public static Object[] extractUserArguments(Object[] arguments) {
         return ArrayUtils.extractRange(arguments, RUNTIME_ARGUMENT_COUNT, arguments.length);
     }
 
+    public static Object[] extractUserArgumentsWithUnshift(Object first, Object[] arguments) {
+        final Object[] range = ArrayUtils.extractRange(arguments, BLOCK_INDEX, arguments.length);
+        range[0] = first;
+        return range;
+    }
+
     public static Object[] concatUserArguments(Object o, Object[] arguments) {
         final Object[] concatenatedArguments;