Merge branch 'jruby-9.1' into psych_3_update

jruby · Apr 17, 2018 · 7390d5a · 7390d5a
2 parents f5f6d16 + c95601e
commit 7390d5a
Show file tree

Hide file tree

Showing 12 changed files with 25 additions and 50 deletions.
diff --git a/.gitignore b/.gitignore
@@ -81,7 +81,7 @@ target
 test/pom.xml
 test/prawn
 test/rails
-test/testapp/testapp
+test/jruby/testapp/testapp
 tool/nailgun/Makefile
 tool/nailgun/config.log
 tool/nailgun/config.status

diff --git a/core/src/main/java/org/jruby/AbstractRubyMethod.java b/core/src/main/java/org/jruby/AbstractRubyMethod.java
@@ -100,7 +100,7 @@ public String getMethodName() {
 
     @JRubyMethod(name = "owner")
     public IRubyObject owner(ThreadContext context) {
-        return method.getRealMethod().getDefinedClass();
+        return implementationModule;
     }
 
     @JRubyMethod(name = "source_location")

diff --git a/core/src/main/java/org/jruby/RubyBignum.java b/core/src/main/java/org/jruby/RubyBignum.java
@@ -420,7 +420,7 @@ private IRubyObject op_divide(ThreadContext context, IRubyObject other, boolean
             if (slash) {
                 return RubyFloat.newFloat(runtime, div);
             } else {
-                return RubyNumeric.dbl2num(runtime, div);
+                return RubyNumeric.dbl2ival(runtime, div);
             }
         } else {
             return coerceBin(context, slash ? sites(context).op_quo : sites(context).div, other);
@@ -634,7 +634,7 @@ public IRubyObject op_pow19(ThreadContext context, IRubyObject other) {
         if (Double.isInfinite(pow)) {
             return RubyFloat.newFloat(runtime, pow);
         }
-        return RubyNumeric.dbl2num(runtime, pow);
+        return RubyNumeric.dbl2ival(runtime, pow);
     }
 
     /** rb_big_and

diff --git a/core/src/main/java/org/jruby/RubyFixnum.java b/core/src/main/java/org/jruby/RubyFixnum.java
@@ -815,7 +815,7 @@ private IRubyObject powerFixnum19(ThreadContext context, IRubyObject other) {
             return this;
         }
         if (a == 0) {
-            return b > 0 ? RubyFixnum.zero(runtime) : RubyNumeric.dbl2num(runtime, 1.0 / 0.0);
+            return b > 0 ? RubyFixnum.zero(runtime) : RubyNumeric.dbl2ival(runtime, 1.0 / 0.0);
         }
         if (a == 1) {
             return RubyFixnum.one(runtime);

diff --git a/core/src/main/java/org/jruby/RubyFloat.java b/core/src/main/java/org/jruby/RubyFloat.java
@@ -411,7 +411,7 @@ public IRubyObject divmod(ThreadContext context, IRubyObject other) {
                 mod += y;
             }
             final Ruby runtime = getRuntime();
-            IRubyObject car = dbl2num(runtime, div);
+            IRubyObject car = dbl2ival(runtime, div);
             RubyFloat cdr = RubyFloat.newFloat(runtime, mod);
             return RubyArray.newArray(runtime, car, cdr);
         default:
@@ -717,7 +717,7 @@ public IRubyObject truncate() {
         if (f > 0.0) f = Math.floor(f);
         if (f < 0.0) f = Math.ceil(f);
 
-        return dbl2num(getRuntime(), f);
+        return dbl2ival(getRuntime(), f);
     }
 
     /** flo_numerator
@@ -756,7 +756,7 @@ public IRubyObject to_r(ThreadContext context) {
 
         Ruby runtime = context.runtime;
 
-        IRubyObject rf = RubyNumeric.dbl2num(runtime, f);
+        IRubyObject rf = RubyNumeric.dbl2ival(runtime, f);
         IRubyObject rn = RubyFixnum.newFixnum(runtime, n);
         return f_mul(context, rf, f_expt(context, RubyFixnum.newFixnum(runtime, FLT_RADIX), rn));
     }
@@ -786,7 +786,7 @@ public IRubyObject rationalize(ThreadContext context, IRubyObject[] args) {
             long n = exp[0] - DBL_MANT_DIG;
 
 
-            IRubyObject rf = RubyNumeric.dbl2num(runtime, f);
+            IRubyObject rf = RubyNumeric.dbl2ival(runtime, f);
             IRubyObject rn = RubyFixnum.newFixnum(runtime, n);
 
             if (f_zero_p(context, rf) || !(f_negative_p(context, rn) || f_zero_p(context, rn)))
@@ -817,7 +817,7 @@ public IRubyObject rationalize(ThreadContext context, IRubyObject[] args) {
     @JRubyMethod(name = "floor")
     @Override
     public IRubyObject floor() {
-        return dbl2num(getRuntime(), Math.floor(value));
+        return dbl2ival(getRuntime(), Math.floor(value));
     }
 
     /** flo_ceil
@@ -826,15 +826,15 @@ public IRubyObject floor() {
     @JRubyMethod(name = "ceil")
     @Override
     public IRubyObject ceil() {
-        return dbl2num(getRuntime(), Math.ceil(value));
+        return dbl2ival(getRuntime(), Math.ceil(value));
     }
 
     /** flo_round
      *
      */
     @Override
     public IRubyObject round() {
-        return dbl2num(getRuntime(), val2dbl());
+        return dbl2ival(getRuntime(), val2dbl());
     }
 
     @JRubyMethod(name = "round", optional = 1)
@@ -869,7 +869,7 @@ public IRubyObject round(ThreadContext context, IRubyObject[] args) {
             return RubyFloat.newFloat(context.runtime, number);
         }
         if (digits < -(binexp > 0 ? binexp / 3 + 1 : binexp / 4)) {
-            return dbl2num(context.runtime, (long) 0);
+            return dbl2ival(context.runtime, (long) 0);
         }
 
         if (Double.isInfinite(magnifier)) {
@@ -898,7 +898,7 @@ public IRubyObject round(ThreadContext context, IRubyObject[] args) {
                 BigDecimal roundedNumber = new BigDecimal(Double.toString(number));
                 return RubyBignum.newBignum(context.runtime, roundedNumber.toBigInteger());
             }
-            return dbl2num(context.runtime, (long)number);
+            return dbl2ival(context.runtime, (long)number);
         }
     }
 

diff --git a/core/src/main/java/org/jruby/RubyMethod.java b/core/src/main/java/org/jruby/RubyMethod.java
@@ -281,11 +281,6 @@ public IRubyObject receiver(ThreadContext context) {
         return receiver;
     }
 
-    @JRubyMethod
-    public IRubyObject owner(ThreadContext context) {
-        return implementationModule;
-    }
-
     @JRubyMethod
     public IRubyObject source_location(ThreadContext context) {
         Ruby runtime = context.runtime;

diff --git a/core/src/main/java/org/jruby/RubyNumeric.java b/core/src/main/java/org/jruby/RubyNumeric.java
@@ -232,10 +232,14 @@ private static long float2long(RubyFloat flt) {
         }
     }
 
+    public static IRubyObject dbl2num(Ruby runtime, double val) {
+        return RubyFloat.newFloat(runtime, val);
+    }
+
     /** rb_dbl2big + LONG2FIX at once (numeric.c)
      *
      */
-    public static IRubyObject dbl2num(Ruby runtime, double val) {
+    public static IRubyObject dbl2ival(Ruby runtime, double val) {
         if (Double.isInfinite(val)) {
             throw runtime.newFloatDomainError(val < 0 ? "-Infinity" : "Infinity");
         }

diff --git a/core/src/main/java/org/jruby/util/ShellLauncher.java b/core/src/main/java/org/jruby/util/ShellLauncher.java
@@ -411,38 +411,14 @@ private static File findPathFile(Ruby runtime, String fname, String[] path, bool
         return pathFile;
     }
 
-    /**
-     * This is an older version of the path-finding logic used by our pure-Java process launching in backquote,
-     * system, etc. The newer version below, used by native process launching, appears to break execution of commands
-     * in the current working directory, e.g. "./testapp".
-     *
-     * MRI: Older version of logic for dln_find_exe_r used by popen logic
-     */
     public static File findPathExecutable(Ruby runtime, String fname) {
         RubyHash env = (RubyHash) runtime.getObject().getConstant("ENV");
         IRubyObject pathObject = env.op_aref(runtime.getCurrentContext(), RubyString.newString(runtime, PATH_ENV));
-        String[] pathNodes = null;
-        if (pathObject == null) {
-            pathNodes = DEFAULT_PATH; // ASSUME: not modified by callee
-        }
-        else {
-            String pathSeparator = System.getProperty("path.separator");
-            String path = pathObject.toString();
-            if (Platform.IS_WINDOWS) {
-                // Windows-specific behavior
-                path = "." + pathSeparator + path;
-            }
-            pathNodes = path.split(pathSeparator);
-        }
-        return findPathFile(runtime, fname, pathNodes, true);
+        return findPathExecutable(runtime, fname, pathObject);
     }
 
-    /**
-     * Search for the given executable using the given PATH or one provided by system defaults.
-     *
-     * This is the updated version of MRI: dln_find_exe_r logic.
-     */
-    public static File dlnFindExe(Ruby runtime, String fname, IRubyObject pathObject) {
+    // MRI: Hopefully close to dln_find_exe_r used by popen logic
+    public static File findPathExecutable(Ruby runtime, String fname, IRubyObject pathObject) {
         String[] pathNodes;
 
         if (pathObject == null || pathObject.isNil()) {

diff --git a/core/src/main/java/org/jruby/util/Sprintf.java b/core/src/main/java/org/jruby/util/Sprintf.java
@@ -704,7 +704,7 @@ else if ((flags & FLAG_MINUS) != 0) {
                     if (type != ClassIndex.FIXNUM && type != ClassIndex.BIGNUM) {
                         switch(type) {
                         case FLOAT:
-                            arg = RubyNumeric.dbl2num(arg.getRuntime(),((RubyFloat)arg).getValue());
+                            arg = RubyNumeric.dbl2ival(arg.getRuntime(),((RubyFloat)arg).getValue());
                             break;
                         case STRING:
                             arg = ((RubyString)arg).stringToInum19(0, true);

diff --git a/core/src/main/java/org/jruby/util/TypeConverter.java b/core/src/main/java/org/jruby/util/TypeConverter.java
@@ -433,7 +433,7 @@ public static IRubyObject convertToInteger(ThreadContext context, IRubyObject va
                 double value = ((RubyFloat)val).getValue();
                 if (value <= RubyFixnum.MAX ||
                         value >= RubyFixnum.MIN) {
-                    return RubyNumeric.dbl2num(context.runtime, value);
+                    return RubyNumeric.dbl2ival(context.runtime, value);
                 }
             } else if (val instanceof RubyFixnum || val instanceof RubyBignum) {
                 if (base != 0) raiseIntegerBaseError(context);

diff --git a/core/src/main/java/org/jruby/util/io/PopenExecutor.java b/core/src/main/java/org/jruby/util/io/PopenExecutor.java
@@ -2002,7 +2002,7 @@ public int compare(String o1, String o2) {
     }
 
     private static String dlnFindExeR(Ruby runtime, String fname, IRubyObject path) {
-        File exePath = ShellLauncher.dlnFindExe(runtime, fname, path);
+        File exePath = ShellLauncher.findPathExecutable(runtime, fname, path);
         return exePath != null ? exePath.getAbsolutePath() : null;
     }
 

diff --git a/test/jruby/testapp/testapp b/test/jruby/testapp/testapp