Changeset 439 for EcnlProtoTool/trunk/mruby-2.1.1/mrblib/numeric.rb

Timestamp:

Jul 9, 2020, 8:51:43 AM (4 years ago)

Author:

coas-nagasima

Message:

mrubyを2.1.1に更新

Location:

EcnlProtoTool/trunk/mruby-2.1.1

Files:

• . (moved) (moved from EcnlProtoTool/trunk/mruby-1.3.0 )
• mrblib/numeric.rb (modified) (5 diffs)

EcnlProtoTool/trunk/mruby-2.1.1/mrblib/numeric.rb

@@ -46 +46 @@
   # ISO 15.2.8.3.15
   def downto(num, &block)
-    return to_enum(:downto, num) unless block_given?
+    return to_enum(:downto, num) unless block
 
     i = self.to_i
@@ -71 +71 @@
   # ISO 15.2.8.3.22
   def times &block
-    return to_enum :times unless block_given?
+    return to_enum :times unless block
 
     i = 0
@@ -87 +87 @@
   # ISO 15.2.8.3.27
   def upto(num, &block)
-    return to_enum(:upto, num) unless block_given?
+    return to_enum(:upto, num) unless block
 
     i = self.to_i
@@ -103 +103 @@
   def step(num=nil, step=1, &block)
     raise ArgumentError, "step can't be 0" if step == 0
-    return to_enum(:step, num, step) unless block_given?
+    return to_enum(:step, num, step) unless block
 
-    i = if num.kind_of? Float then self.to_f else self end
-    if num == nil
+    i = __coerce_step_counter(num, step)
+    if num == self || step.infinite?
+      block.call(i) if step > 0 && i <= (num||i) || step < 0 && i >= (num||-i)
+    elsif num == nil
       while true
         block.call(i)
-        i+=step
+        i += step
       end
-      return self
-    end
-    if step > 0
+    elsif step > 0
       while i <= num
         block.call(i)
@@ -162 +162 @@
   alias truncate floor
 end
-
-##
-# Float
-#
-# ISO 15.2.9
-class Float
-  # mruby special - since mruby integers may be upgraded to floats,
-  # floats should be compatible to integers.
-  include Integral
-end