jruby · Dec 23, 2015 · Dec 23, 2015 · Dec 23, 2015
Showing with 22 additions and 33 deletions.

+0 −3 core/src/main/java/org/jruby/RubyArgsFile.java

+10 −27 core/src/main/java/org/jruby/RubyComparable.java

+12 −3 core/src/main/java/org/jruby/RubyObject.java
diff --git a/core/src/main/java/org/jruby/RubyArgsFile.java b/core/src/main/java/org/jruby/RubyArgsFile.java
@@ -521,9 +521,6 @@ public static IRubyObject close(ThreadContext context, IRubyObject recv) {
         ArgsFileData data = ArgsFileData.getDataFrom(recv);
 
         data.next_argv(context);
-        if (isClosed(context, data.currentFile)) {
-            throw context.runtime.newIOError(RubyIO.CLOSED_STREAM_MSG);
-        }
 
         argf_close(context, data.currentFile);
 

diff --git a/core/src/main/java/org/jruby/RubyComparable.java b/core/src/main/java/org/jruby/RubyComparable.java
@@ -146,36 +146,19 @@ private static IRubyObject callCmpMethod(final ThreadContext context, final IRub
         if (recv == other) return runtime.getTrue();
 
         final IRubyObject $ex = context.getErrorInfo();
-        try {
-            IRubyObject result = runtime.execRecursiveOuter(new Ruby.RecursiveFunction() {
-                @Override
-                public IRubyObject call(IRubyObject obj, boolean recur) {
-                    if (recur) return runtime.getNil();
-                    return invokedynamic(context, recv, OP_CMP, other);
-                }
-            }, recv);
-
-            // This is only to prevent throwing exceptions by cmperr - it has poor performance
-            if ( result.isNil() ) return returnValueOnError;
-
-            return RubyBoolean.newBoolean(runtime, cmpint(context, result, recv, other) == 0);
-        }
-        catch (RaiseException e) {
-            if (e.getException().kind_of_p(context, runtime.getStandardError()).isTrue()) {
-                cmpFailed(context);
-                // clear error info resulting from failure to compare (JRUBY-3292)
-                context.setErrorInfo($ex); // restore previous $! error (if any)
-                return returnValueOnError;
+
+        IRubyObject result = runtime.execRecursiveOuter(new Ruby.RecursiveFunction() {
+            @Override
+            public IRubyObject call(IRubyObject obj, boolean recur) {
+                if (recur) return runtime.getNil();
+                return invokedynamic(context, recv, OP_CMP, other);
             }
-            throw e;
-        }
-    }
+        }, recv);
 
-    private static void cmpFailed(ThreadContext context) {
-        RubyWarnings warnings = context.runtime.getWarnings();
+        // This is only to prevent throwing exceptions by cmperr - it has poor performance
+        if ( result.isNil() ) return returnValueOnError;
 
-        warnings.warn("Comparable#== will no more rescue exceptions of #<=> in the next release.");
-        warnings.warn("Return nil in #<=> if the comparison is inappropriate or avoid such comparison.");
+        return RubyBoolean.newBoolean(runtime, cmpint(context, result, recv, other) == 0);
     }
 
     /** cmp_gt

diff --git a/core/src/main/java/org/jruby/RubyObject.java b/core/src/main/java/org/jruby/RubyObject.java
@@ -541,13 +541,22 @@ public static RubyString inspect(ThreadContext context, IRubyObject object) {
     static IRubyObject dig(ThreadContext context, IRubyObject obj, IRubyObject[] args, int idx) {
         if ( obj.isNil() ) return context.nil;
         if ( obj instanceof RubyArray ) {
-            return ((RubyArray) obj).dig(context, args, idx);
+            // TODO: cache somewhere
+            if (obj.getMetaClass().searchMethod("dig").isBuiltin()) {
+                return ((RubyArray) obj).dig(context, args, idx);
+            }
         }
         if ( obj instanceof RubyHash ) {
-            return ((RubyHash) obj).dig(context, args, idx);
+            // TODO: cache somewhere
+            if (obj.getMetaClass().searchMethod("dig").isBuiltin()) {
+                return ((RubyHash) obj).dig(context, args, idx);
+            }
         }
         if ( obj instanceof RubyStruct ) {
-            return ((RubyStruct) obj).dig(context, args, idx);
+            // TODO: cache somewhere
+            if (obj.getMetaClass().searchMethod("dig").isBuiltin()) {
+                return ((RubyStruct) obj).dig(context, args, idx);
+            }
         }
         if ( obj.respondsTo("dig") ) {
             final int len = args.length - idx;