WIP

elia · elia · commit 3f7eb47c7a25 · 2014-04-25T23:08:37.000+02:00
diff --git a/opal/corelib/numeric.rb b/opal/corelib/numeric.rb
@@ -496,6 +496,10 @@ def positive?
   def negative?
     `1 / self < 0`
   end
+
+  def self.===(other)
+    `!!other._isNumber`
+  end
 end
 
 Fixnum = Numeric
diff --git a/opal/corelib/range.rb b/opal/corelib/range.rb
@@ -100,8 +100,53 @@ def size
     (`Math.abs(_end - _begin) + 1`).to_i
   end
 
-  def step(n = 1)
-    raise NotImplementedError
+  def step(step = 1)
+    return enum_for :step, step unless block_given?
+
+    _begin  = @begin
+    _end    = @end
+    current = _begin
+
+    p ['>>>>', inspect, step]
+
+    # if Numeric === _begin && (Float === step && !(Integer === step))
+    p ['Numeric === _begin', Numeric === _begin]
+    if Numeric === _begin
+      unless Numeric === step
+        step = Opal.coerce_to step, Integer, :to_int
+        raise TypeError, "step's not a number" unless Numeric === step
+      end
+    else
+      step = Opal.coerce_to step, Integer, :to_int
+      raise TypeError, "step's not an Integer"  unless Integer === step
+      # raise TypeError, "step's not a number" unless Float === step
+    end
+
+    raise ArgumentError, "step can't be negative" if step < 0
+    raise ArgumentError, "step can't be zero"     if step == 0
+
+    if Numeric === _begin && Numeric === _end && Numeric === step # fixnums are special
+      _end += step / 2.0 unless @exclude
+      %x{
+        while (current < _end) {
+          #{yield(current)};
+          current += step;
+        }
+      }
+    else
+      raise TypeError, 'range begin does not respond to #succ' unless _begin.respond_to? :succ
+      _end = _end.succ unless @exclude
+      yield current
+      until `((#{current <=> _end}) < 0)`
+        %x{
+          for (var i = step; i > 0; i--) {
+            #{current = current.succ};
+          }
+        }
+        yield current
+      end
+    end
+    self
   end
 
   def to_s
diff --git a/spec/filters/unsupported/float.rb b/spec/filters/unsupported/float.rb
@@ -2,4 +2,8 @@
   fails "Array#inspect represents a recursive element with '[...]'"
   fails "Array#to_s represents a recursive element with '[...]'"
   fails "Array#eql? returns false if any corresponding elements are not #eql?"
+
+  # The spec uses the float "2.0" which is undistiguishable from an Integer
+  fails "Range#step with exclusive end and String values raises a TypeError when passed a Float step"
+  fails "Range#step with inclusive end and String values raises a TypeError when passed a Float step"
 end
diff --git a/spec/rubyspecs b/spec/rubyspecs
@@ -47,6 +47,7 @@ corelib/core/matchdata/to_a_spec
 
 corelib/core/range/begin_spec
 corelib/core/range/end_spec
+corelib/core/range/step_spec
 corelib/core/range/size_spec
 
 corelib/core/string/allocate_spec
