jruby · Jan 2, 2018 · Jan 2, 2018
Showing with 27 additions and 10 deletions.

+12 −8 core/src/main/java/org/jruby/RubyBasicObject.java

+14 −2 core/src/main/java/org/jruby/RubyKernel.java

+1 −0 core/src/main/java/org/jruby/RubyObject.java
diff --git a/core/src/main/java/org/jruby/RubyBasicObject.java b/core/src/main/java/org/jruby/RubyBasicObject.java
@@ -2107,31 +2107,34 @@ public void checkFrozen() {
      * in both the compiler and the interpreter, the performance
      * benefit is important for this method.
      */
+    @Deprecated // NOTE: does not match Ruby 2.x rules (does method bound check only)
     public final RubyBoolean respond_to_p(IRubyObject mname) {
         return getRuntime().newBoolean(getMetaClass().respondsToMethod(mname.asJavaString(), true));
     }
 
+    @Deprecated
     public final RubyBoolean respond_to_p19(IRubyObject mname) {
-        return respond_to_p19(mname, false);
+        return respond_to_p(getRuntime().getCurrentContext(), mname, false);
     }
 
+    @Deprecated // NOTE: does not match Ruby 2.x rules (does method bound check only)
     public final RubyBoolean respond_to_p(IRubyObject mname, IRubyObject includePrivate) {
         String name = mname.asJavaString();
         return getRuntime().newBoolean(getMetaClass().isMethodBound(name, !includePrivate.isTrue()));
     }
 
+    @Deprecated
     public final RubyBoolean respond_to_p19(IRubyObject mname, IRubyObject includePrivate) {
-        return respond_to_p19(mname, includePrivate.isTrue());
+        return respond_to_p(getRuntime().getCurrentContext(), mname, includePrivate.isTrue());
     }
 
-    private RubyBoolean respond_to_p19(IRubyObject mname, final boolean includePrivate) {
-        final Ruby runtime = getRuntime();
-        final String name = mname.asJavaString();
+    final RubyBoolean respond_to_p(ThreadContext context, IRubyObject methodName, final boolean includePrivate) {
+        final Ruby runtime = context.runtime;
+        final String name = methodName.asJavaString();
         if (getMetaClass().respondsToMethod(name, !includePrivate)) return runtime.getTrue();
         // MRI (1.9) always passes down a symbol when calling respond_to_missing?
-        if ( ! (mname instanceof RubySymbol) ) mname = runtime.newSymbol(name);
-        ThreadContext context = runtime.getCurrentContext();
-        IRubyObject respond = sites(context).respond_to_missing.call(context, this, this, mname, runtime.newBoolean(includePrivate));
+        if ( ! (methodName instanceof RubySymbol) ) methodName = runtime.newSymbol(name);
+        IRubyObject respond = sites(context).respond_to_missing.call(context, this, this, methodName, runtime.newBoolean(includePrivate));
         return runtime.newBoolean( respond.isTrue() );
     }
 
@@ -2160,6 +2163,7 @@ public RubyClass type() {
      * The deprecated version of type, that emits a deprecation
      * warning.
      */
+    @Deprecated
     public RubyClass type_deprecated() {
         getRuntime().getWarnings().warn(ID.DEPRECATED_METHOD, "Object#type is deprecated; use Object#class");
         return type();

diff --git a/core/src/main/java/org/jruby/RubyKernel.java b/core/src/main/java/org/jruby/RubyKernel.java
@@ -1892,24 +1892,36 @@ public static IRubyObject initialize_dup(ThreadContext context, IRubyObject self
         return sites(context).initialize_copy.call(context, self, self, original);
     }
 
+    @Deprecated
     public static RubyBoolean respond_to_p(IRubyObject self, IRubyObject mname) {
         return ((RubyBasicObject) self).respond_to_p(mname);
     }
 
-    @JRubyMethod(name = "respond_to?")
+    @Deprecated
     public static IRubyObject respond_to_p19(IRubyObject self, IRubyObject mname) {
         return ((RubyBasicObject) self).respond_to_p19(mname);
     }
 
+    @Deprecated
     public static RubyBoolean respond_to_p(IRubyObject self, IRubyObject mname, IRubyObject includePrivate) {
         return ((RubyBasicObject) self).respond_to_p(mname, includePrivate);
     }
 
-    @JRubyMethod(name = "respond_to?")
+    @Deprecated
     public static IRubyObject respond_to_p19(IRubyObject self, IRubyObject mname, IRubyObject includePrivate) {
         return ((RubyBasicObject) self).respond_to_p19(mname, includePrivate);
     }
 
+    @JRubyMethod(name = "respond_to?")
+    public static IRubyObject respond_to_p(ThreadContext context, IRubyObject self, IRubyObject name) {
+        return ((RubyBasicObject) self).respond_to_p(context, name, false);
+    }
+
+    @JRubyMethod(name = "respond_to?")
+    public static IRubyObject respond_to_p(ThreadContext context, IRubyObject self, IRubyObject name, IRubyObject includePrivate) {
+        return ((RubyBasicObject) self).respond_to_p(context, name, includePrivate.isTrue());
+    }
+
     @JRubyMethod
     public static RubyFixnum hash(IRubyObject self) {
         return ((RubyBasicObject)self).hash();

diff --git a/core/src/main/java/org/jruby/RubyObject.java b/core/src/main/java/org/jruby/RubyObject.java
@@ -312,6 +312,7 @@ public ClassIndex getNativeClassIndex() {
 
     /**
      * Simple helper to print any objects.
+     * @deprecated no longer used - uses Java's System.out
      */
     public static void puts(Object obj) {
         System.out.println(obj.toString());