jruby · Jan 25, 2015 · Jan 25, 2015 · Jan 25, 2015 · Jan 25, 2015 · Jan 25, 2015
diff --git a/core/src/main/ruby/jruby/truffle/core/rubinius/kernel/bootstrap/kernel.rb b/core/src/main/ruby/jruby/truffle/core/rubinius/kernel/bootstrap/kernel.rb
@@ -35,8 +35,10 @@
 # Only part of Rubinius' kernel.rb
 
 module Kernel
+
   alias_method :eql?, :equal?
 
   # Truffle: no extra indirection for Kernel#send.
   alias_method :send, :__send__ # from BasicObject
+
 end
diff --git a/core/src/main/ruby/jruby/truffle/core/rubinius/kernel/common/kernel.rb b/core/src/main/ruby/jruby/truffle/core/rubinius/kernel/common/kernel.rb
@@ -52,6 +52,29 @@ def Float(obj)
   end
   module_function :Float
 
+  ##
+  # MRI uses a macro named NUM2DBL which has essentially the same semantics as
+  # Float(), with the difference that it raises a TypeError and not a
+  # ArgumentError. It is only used in a few places (in MRI and Rubinius).
+  #--
+  # If we can, we should probably get rid of this.
+
+  def FloatValue(obj)
+    exception = TypeError.new 'no implicit conversion to float'
+
+    case obj
+    when String
+      raise exception
+    else
+      begin
+        Rubinius::Type.coerce_object_to_float obj
+      rescue
+        raise exception
+      end
+    end
+  end
+  private :FloatValue
+
   ##
   # MRI uses a macro named StringValue which has essentially the same
   # semantics as obj.coerce_to(String, :to_str), but rather than using that
@@ -82,4 +105,6 @@ def object_id
     raise PrimitiveFailure, "Kernel#object_id primitive failed"
   end
 
+
+
 end
diff --git a/core/src/main/ruby/jruby/truffle/core/rubinius/kernel/common/numeric.rb b/core/src/main/ruby/jruby/truffle/core/rubinius/kernel/common/numeric.rb
@@ -28,6 +28,14 @@
 
 class Numeric
 
+  def +@
+    self
+  end
+
+  def -@
+    0 - self
+  end
+
   def eql?(other)
     return false unless other.instance_of? self.class
     self == other
@@ -120,4 +128,141 @@ def denominator
     to_r.denominator
   end
 
+  def abs2
+    self * self
+  end
+
+  def arg
+    if self < 0
+      Math::PI
+    else
+      0
+    end
+  end
+
+  alias_method :angle, :arg
+  alias_method :phase, :arg
+
+  def ceil
+    FloatValue(self).ceil
+  end
+
+  def conjugate
+    self
+  end
+  alias_method :conj, :conjugate
+
+  def floor
+    FloatValue(self).floor
+  end
+
+  def i
+    Complex(0, self)
+  end
+
+  def to_c
+    Complex(self, 0)
+  end
+
+  def real
+    self
+  end
+
+  def imag
+    0
+  end
+  alias_method :imaginary, :imag
+
+  def rect
+    [self, 0]
+  end
+  alias_method :rectangular, :rect
+
+  def truncate
+    Float(self).truncate
+  end
+
+  def round
+    to_f.round
+  end
+
+  def polar
+    return abs, arg
+  end
+
+  # Delegate #to_int to #to_i in subclasses
+  def to_int
+    to_i
+  end
+
+  def integer?
+    false
+  end
+
+  def modulo(other)
+    self - other * self.div(other)
+  end
+  alias_method :%, :modulo
+
+  def quo(other)
+    Rubinius.privately do
+      Rational.convert(self, 1, false) / other
+    end
+  end
+
+  def step(limit, step=1)
+    return to_enum(:step, limit, step) unless block_given?
+
+    raise ArgumentError, "step cannot be 0" if step == 0
+
+    value = self
+    if value.kind_of? Float or limit.kind_of? Float or step.kind_of? Float
+      # Ported from MRI
+
+      value = FloatValue(value)
+      limit = FloatValue(limit)
+      step =  FloatValue(step)
+
+      if step.infinite?
+        yield value if step > 0 ? value <= limit : value >= limit
+      else
+        err = (value.abs + limit.abs + (limit - value).abs) / step.abs * Float::EPSILON
+        if err.finite?
+          err = 0.5 if err > 0.5
+          n = ((limit - value) / step + err).floor
+          i = 0
+          if step > 0
+            while i <= n
+              d = i * step + value
+              d = limit if limit < d
+              yield d
+              i += 1
+            end
+          else
+            while i <= n
+              d = i * step + value
+              d = limit if limit > d
+              yield d
+              i += 1
+            end
+          end
+        end
+      end
+    else
+      if step > 0
+        until value > limit
+          yield value
+          value += step
+        end
+      else
+        until value < limit
+          yield value
+          value += step
+        end
+      end
+    end
+
+    return self
+  end
+
 end
diff --git a/spec/truffle/tags/core/numeric/abs2_tags.txt b/spec/truffle/tags/core/numeric/abs2_tags.txt
diff --git a/spec/truffle/tags/core/numeric/abs_tags.txt b/spec/truffle/tags/core/numeric/abs_tags.txt
diff --git a/spec/truffle/tags/core/numeric/angle_tags.txt b/spec/truffle/tags/core/numeric/angle_tags.txt
diff --git a/spec/truffle/tags/core/numeric/arg_tags.txt b/spec/truffle/tags/core/numeric/arg_tags.txt
diff --git a/spec/truffle/tags/core/numeric/ceil_tags.txt b/spec/truffle/tags/core/numeric/ceil_tags.txt
diff --git a/spec/truffle/tags/core/numeric/coerce_tags.txt b/spec/truffle/tags/core/numeric/coerce_tags.txt
diff --git a/spec/truffle/tags/core/numeric/comparison_tags.txt b/spec/truffle/tags/core/numeric/comparison_tags.txt
diff --git a/spec/truffle/tags/core/numeric/conj_tags.txt b/spec/truffle/tags/core/numeric/conj_tags.txt
diff --git a/spec/truffle/tags/core/numeric/conjugate_tags.txt b/spec/truffle/tags/core/numeric/conjugate_tags.txt
diff --git a/spec/truffle/tags/core/numeric/denominator_tags.txt b/spec/truffle/tags/core/numeric/denominator_tags.txt
diff --git a/spec/truffle/tags/core/numeric/div_tags.txt b/spec/truffle/tags/core/numeric/div_tags.txt
@@ -1,2 +1 @@
 fails:Numeric#div calls self#/ with other, then returns the #floor'ed result
-fails:Numeric#div raises ZeroDivisionError for 0
diff --git a/spec/truffle/tags/core/numeric/eql_tags.txt b/spec/truffle/tags/core/numeric/eql_tags.txt
diff --git a/spec/truffle/tags/core/numeric/fdiv_tags.txt b/spec/truffle/tags/core/numeric/fdiv_tags.txt
diff --git a/spec/truffle/tags/core/numeric/floor_tags.txt b/spec/truffle/tags/core/numeric/floor_tags.txt
diff --git a/spec/truffle/tags/core/numeric/i_tags.txt b/spec/truffle/tags/core/numeric/i_tags.txt
diff --git a/spec/truffle/tags/core/numeric/imag_tags.txt b/spec/truffle/tags/core/numeric/imag_tags.txt
diff --git a/spec/truffle/tags/core/numeric/imaginary_tags.txt b/spec/truffle/tags/core/numeric/imaginary_tags.txt
diff --git a/spec/truffle/tags/core/numeric/integer_tags.txt b/spec/truffle/tags/core/numeric/integer_tags.txt
diff --git a/spec/truffle/tags/core/numeric/magnitude_tags.txt b/spec/truffle/tags/core/numeric/magnitude_tags.txt
diff --git a/spec/truffle/tags/core/numeric/modulo_tags.txt b/spec/truffle/tags/core/numeric/modulo_tags.txt
diff --git a/spec/truffle/tags/core/numeric/nonzero_tags.txt b/spec/truffle/tags/core/numeric/nonzero_tags.txt
diff --git a/spec/truffle/tags/core/numeric/numerator_tags.txt b/spec/truffle/tags/core/numeric/numerator_tags.txt
diff --git a/spec/truffle/tags/core/numeric/numeric_tags.txt b/spec/truffle/tags/core/numeric/numeric_tags.txt
diff --git a/spec/truffle/tags/core/numeric/phase_tags.txt b/spec/truffle/tags/core/numeric/phase_tags.txt
diff --git a/spec/truffle/tags/core/numeric/polar_tags.txt b/spec/truffle/tags/core/numeric/polar_tags.txt
diff --git a/spec/truffle/tags/core/numeric/quo_tags.txt b/spec/truffle/tags/core/numeric/quo_tags.txt
diff --git a/spec/truffle/tags/core/numeric/real_tags.txt b/spec/truffle/tags/core/numeric/real_tags.txt
diff --git a/spec/truffle/tags/core/numeric/rect_tags.txt b/spec/truffle/tags/core/numeric/rect_tags.txt
diff --git a/spec/truffle/tags/core/numeric/rectangular_tags.txt b/spec/truffle/tags/core/numeric/rectangular_tags.txt
diff --git a/spec/truffle/tags/core/numeric/round_tags.txt b/spec/truffle/tags/core/numeric/round_tags.txt
diff --git a/spec/truffle/tags/core/numeric/step_tags.txt b/spec/truffle/tags/core/numeric/step_tags.txt
@@ -1,50 +1,7 @@
-fails:Numeric#step raises an ArgumentError when step is 0
-fails:Numeric#step raises an ArgumentError when step is 0.0
-fails:Numeric#step defaults to step = 1
 fails:Numeric#step returns an Enumerator when step is 0
 fails:Numeric#step returns an Enumerator when not passed a block and self > stop
 fails:Numeric#step returns an Enumerator when not passed a block and self < stop
 fails:Numeric#step returns an Enumerator that uses the given step
-fails:Numeric#step does not rescue ArgumentError exceptions
-fails:Numeric#step does not rescue TypeError exceptions
-fails:Numeric#step with [stop, step] increments self using #+ until self > stop when step > 0
-fails:Numeric#step with [stop, step] decrements self using #+ until self < stop when step < 0
-fails:Numeric#step Numeric#step with [stop, step] when self, stop and step are Fixnums yields only Fixnums
 fails:Numeric#step Numeric#step with [stop, step] when self and stop are Fixnums but step is a String returns an Enumerator if not given a block
 fails:Numeric#step Numeric#step with [stop, step] when self and stop are Fixnums but step is a String raises an ArgumentError if given a block
 fails:Numeric#step Numeric#step with [stop, step] when self and stop are Floats but step is a String returns an Enumerator if not given a block
-fails:Numeric#step Numeric#step with [stop, step] when self and stop are Floats but step is a String raises a TypeError if given a block
-fails:Numeric#step Numeric#step with [stop, +step] when self, stop and step are Fixnums yields while increasing self by step until stop is reached
-fails:Numeric#step Numeric#step with [stop, +step] when self, stop and step are Fixnums yields once when self equals stop
-fails:Numeric#step Numeric#step with [stop, +step] when self, stop and step are Fixnums does not yield when self is greater than stop
-fails:Numeric#step Numeric#step with [stop, -step] when self, stop and step are Fixnums yields while decreasing self by step until stop is reached
-fails:Numeric#step Numeric#step with [stop, -step] when self, stop and step are Fixnums yields once when self equals stop
-fails:Numeric#step Numeric#step with [stop, -step] when self, stop and step are Fixnums does not yield when self is less than stop
-fails:Numeric#step Numeric#step with [stop, step] yields only Floats when self is a Float
-fails:Numeric#step Numeric#step with [stop, step] yields only Floats when stop is a Float
-fails:Numeric#step Numeric#step with [stop, step] yields only Floats when step is a Float
-fails:Numeric#step Numeric#step with [stop, +step] when self, stop or step is a Float yields while increasing self by step while < stop
-fails:Numeric#step Numeric#step with [stop, +step] when self, stop or step is a Float yields once when self equals stop
-fails:Numeric#step Numeric#step with [stop, +step] when self, stop or step is a Float does not yield when self is greater than stop
-fails:Numeric#step Numeric#step with [stop, +step] when self, stop or step is a Float is careful about not yielding a value greater than limit
-fails:Numeric#step Numeric#step with [stop, -step] when self, stop or step is a Float yields while decreasing self by step while self > stop
-fails:Numeric#step Numeric#step with [stop, -step] when self, stop or step is a Float yields once when self equals stop
-fails:Numeric#step Numeric#step with [stop, -step] when self, stop or step is a Float does not yield when self is less than stop
-fails:Numeric#step Numeric#step with [stop, -step] when self, stop or step is a Float is careful about not yielding a value smaller than limit
-fails:Numeric#step Numeric#step with [stop, +Infinity] yields once if self < stop
-fails:Numeric#step Numeric#step with [stop, +Infinity] yields once when stop is Infinity
-fails:Numeric#step Numeric#step with [stop, +Infinity] yields once when self equals stop
-fails:Numeric#step Numeric#step with [stop, +Infinity] yields once when self and stop are Infinity
-fails:Numeric#step Numeric#step with [stop, +Infinity] does not yield when self > stop
-fails:Numeric#step Numeric#step with [stop, +Infinity] does not yield when stop is -Infinity
-fails:Numeric#step Numeric#step with [stop, -infinity] yields once if self > stop
-fails:Numeric#step Numeric#step with [stop, -infinity] yields once if stop is -Infinity
-fails:Numeric#step Numeric#step with [stop, -infinity] yields once when self equals stop
-fails:Numeric#step Numeric#step with [stop, -infinity] yields once when self and stop are Infinity
-fails:Numeric#step Numeric#step with [stop, -infinity] does not yield when self > stop
-fails:Numeric#step Numeric#step with [stop, -infinity] does not yield when stop is Infinity
-fails:Numeric#step Numeric#step with [infinity, -step] does not yield when self is -infinity
-fails:Numeric#step Numeric#step with [infinity, -step] does not yield when self is +infinity
-fails:Numeric#step Numeric#step with [infinity, step] does not yield when self is infinity
-fails:Numeric#step Numeric#step with [-infinity, step] does not yield when self is -infinity
-fails:Numeric#step Numeric#step with [-infinity, -step] does not yield when self is -infinity
diff --git a/spec/truffle/tags/core/numeric/to_c_tags.txt b/spec/truffle/tags/core/numeric/to_c_tags.txt
diff --git a/spec/truffle/tags/core/numeric/to_int_tags.txt b/spec/truffle/tags/core/numeric/to_int_tags.txt
diff --git a/spec/truffle/tags/core/numeric/truncate_tags.txt b/spec/truffle/tags/core/numeric/truncate_tags.txt
diff --git a/spec/truffle/tags/core/numeric/uminus_tags.txt b/spec/truffle/tags/core/numeric/uminus_tags.txt
@@ -1,4 +1 @@
-fails:Numeric#-@ returns the same value with opposite sign (integers)
-fails:Numeric#-@ returns the same value with opposite sign (floats)
-fails:Numeric#-@ returns the same value with opposite sign (two complement)
 fails:Numeric#-@ with a Numeric subclass calls #coerce(0) on self, then subtracts the second element of the result from the first
diff --git a/spec/truffle/tags/core/numeric/uplus_tags.txt b/spec/truffle/tags/core/numeric/uplus_tags.txt
diff --git a/spec/truffle/tags/core/numeric/zero_tags.txt b/spec/truffle/tags/core/numeric/zero_tags.txt
diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/core/ArrayNodes.java b/truffle/src/main/java/org/jruby/truffle/nodes/core/ArrayNodes.java
@@ -1749,6 +1749,17 @@ public Object firstIntegerFixnum(RubyArray array) {
             }
         }
 
+        @Specialization(guards = "isFloat")
+        public Object firstFloat(RubyArray array) {
+            notDesignedForCompilation();
+
+            if (array.getSize() == 0) {
+                return getContext().getCoreLibrary().getNilObject();
+            } else {
+                return ((double[]) array.getStore())[0];
+            }
+        }
+
         @Specialization(guards = "isObject")
         public Object firstObject(RubyArray array) {
             notDesignedForCompilation();

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/core/FixnumNodes.java b/truffle/src/main/java/org/jruby/truffle/nodes/core/FixnumNodes.java
@@ -119,7 +119,6 @@ public Object add(int a, RubyBignum b) {
         public Object add(VirtualFrame frame, int a, RubyBasicObject b) {
             if (rationalAdd == null) {
                 CompilerDirectives.transferToInterpreterAndInvalidate();
-
                 rationalAdd = insert(DispatchHeadNodeFactory.createMethodCall(getContext()));
             }
 
@@ -172,12 +171,17 @@ public Object add(VirtualFrame frame, long a, RubyBasicObject b) {
     @CoreMethod(names = "-", required = 1)
     public abstract static class SubNode extends BignumNodes.BignumCoreMethodNode {
 
+        @Child private CallDispatchHeadNode rationalConvertNode;
+        @Child private CallDispatchHeadNode rationalSubNode;
+
         public SubNode(RubyContext context, SourceSection sourceSection) {
             super(context, sourceSection);
         }
 
         public SubNode(SubNode prev) {
             super(prev);
+            rationalConvertNode = prev.rationalConvertNode;
+            rationalSubNode = prev.rationalSubNode;
         }
 
         @Specialization(rewriteOn = ArithmeticException.class)
@@ -210,6 +214,19 @@ public double sub(int a, double b) {
             return a - b;
         }
 
+        @Specialization(guards = "isRational(arguments[1])")
+        public Object sub(VirtualFrame frame, int a, RubyBasicObject b) {
+            if (rationalConvertNode == null) {
+                CompilerDirectives.transferToInterpreter();
+                rationalConvertNode = insert(DispatchHeadNodeFactory.createMethodCall(getContext(), true));
+                rationalSubNode = insert(DispatchHeadNodeFactory.createMethodCall(getContext()));
+            }
+
+            final Object aComplex = rationalConvertNode.call(frame, getContext().getCoreLibrary().getRationalClass(), "convert", null, a, 1);
+
+            return rationalSubNode.call(frame, aComplex, "-", null, b);
+        }
+
         @Specialization(rewriteOn = ArithmeticException.class)
         public long sub(long a, int b) {
             return ExactMath.subtractExact(a, b);

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/rubinius/StringPrimitiveNodes.java b/truffle/src/main/java/org/jruby/truffle/nodes/rubinius/StringPrimitiveNodes.java
@@ -118,9 +118,14 @@ public StringToFPrimitiveNode(StringToFPrimitiveNode prev) {
         }
 
         @Specialization
-        public double stringToF(RubyString string) {
+        public Object stringToF(RubyString string) {
             notDesignedForCompilation();
-            return Double.parseDouble(string.toString());
+
+            try {
+                return Double.parseDouble(string.toString());
+            } catch (NumberFormatException e) {
+                return null;
+            }
         }
 
     }
Original file line number	Diff line number	Diff line change
		@@ -1,2 +1 @@
		fails:Numeric#div calls self#/ with other, then returns the #floor'ed result
		fails:Numeric#div raises ZeroDivisionError for 0