Remove experimental unused Method.args from 1.8 era.

jruby · May 9, 2015 · 21ea270 · 21ea270
1 parent a9144eb
commit 21ea270
Showing 4 changed files with 10 additions and 12 deletions.
diff --git a/core/src/main/java/org/jruby/AbstractRubyMethod.java b/core/src/main/java/org/jruby/AbstractRubyMethod.java
@@ -32,10 +32,10 @@
 package org.jruby;
 
 import org.jruby.anno.JRubyMethod;
-import org.jruby.ext.jruby.JRubyLibrary;
 import org.jruby.internal.runtime.methods.DynamicMethod;
 import org.jruby.internal.runtime.methods.IRMethodArgs;
 import org.jruby.internal.runtime.methods.UndefinedMethod;
+import org.jruby.runtime.Helpers;
 import org.jruby.runtime.PositionAware;
 import org.jruby.runtime.ThreadContext;
 import org.jruby.runtime.builtin.IRubyObject;
@@ -135,7 +135,7 @@ public int getLine() {
 
     @JRubyMethod(name = "parameters")
     public IRubyObject parameters(ThreadContext context) {
-        return JRubyLibrary.MethodExtensions.methodArgs(this);
+        return Helpers.methodToParameters(context.runtime, this);
     }
 
     protected IRubyObject super_method(ThreadContext context, IRubyObject receiver, RubyModule superClass) {

diff --git a/core/src/main/java/org/jruby/RubyMethod.java b/core/src/main/java/org/jruby/RubyMethod.java
@@ -31,7 +31,6 @@
  ***** END LICENSE BLOCK *****/
 package org.jruby;
 
-import org.jruby.ext.jruby.JRubyLibrary;
 import org.jruby.anno.JRubyMethod;
 import org.jruby.anno.JRubyClass;
 import org.jruby.internal.runtime.methods.AliasMethod;
@@ -290,7 +289,7 @@ public int getLine() {
 
     @JRubyMethod
     public IRubyObject parameters(ThreadContext context) {
-        return JRubyLibrary.MethodExtensions.methodArgs(this);
+        return Helpers.methodToParameters(context.runtime, this);
     }
 
     @JRubyMethod(optional = 1)

diff --git a/core/src/main/java/org/jruby/ext/jruby/JRubyLibrary.java b/core/src/main/java/org/jruby/ext/jruby/JRubyLibrary.java
@@ -144,14 +144,6 @@ public static IRubyObject identity_hash(ThreadContext context, IRubyObject recv,
     }
 
     public static class MethodExtensions {
-        @JRubyMethod(name = "args")
-        public static IRubyObject methodArgs(IRubyObject recv) {
-            Ruby runtime = recv.getRuntime();
-            AbstractRubyMethod rubyMethod = (AbstractRubyMethod)recv;
-            DynamicMethod method = rubyMethod.getMethod().getRealMethod();
-
-            return Helpers.argumentDescriptorsToParameters(runtime, Helpers.methodToArgumentDescriptors(method), true);
-        }
 
     }
 }
diff --git a/core/src/main/java/org/jruby/runtime/Helpers.java b/core/src/main/java/org/jruby/runtime/Helpers.java
@@ -7,6 +7,7 @@
 
 import jnr.constants.platform.Errno;
 import org.jruby.*;
+import org.jruby.anno.JRubyMethod;
 import org.jruby.ast.ArgsNode;
 import org.jruby.ast.ArgumentNode;
 import org.jruby.ast.DAsgnNode;
@@ -2524,6 +2525,12 @@ public static ArgumentDescriptor[] methodToArgumentDescriptors(DynamicMethod met
         }
     }
 
+    public static IRubyObject methodToParameters(Ruby runtime, AbstractRubyMethod recv) {
+        DynamicMethod method = recv.getMethod().getRealMethod();
+
+        return argumentDescriptorsToParameters(runtime, methodToArgumentDescriptors(method), true);
+    }
+
     public static RubyString getDefinedCall(ThreadContext context, IRubyObject self, IRubyObject receiver, String name) {
         RubyClass metaClass = receiver.getMetaClass();
         DynamicMethod method = metaClass.searchMethod(name);