opal · Apr 13, 2015 · Apr 13, 2015
Showing with 31 additions and 13 deletions.

+22 −12 opal/corelib/kernel.rb

+4 −1 opal/corelib/numeric.rb

+3 −0 spec/filters/unsupported/float.rb

+1 −0 spec/filters/unsupported/private_methods.rb

+1 −0 spec/rubyspecs
diff --git a/opal/corelib/kernel.rb b/opal/corelib/kernel.rb
@@ -478,11 +478,7 @@ def Integer(value, base = undefined)
 
       str = value.toLowerCase();
 
-      if (/^\s*_|__|_\s*$/.test(str)) {
-        #{raise ArgumentError, "invalid value for Integer(): \"#{value}\""}
-      }
-
-      str = str.replace(/_/g, '');
+      str = str.replace(/(\d)_(\d)/g, '$1$2');
 
       if (!/^\s*[+-]?[0-9a-z]+\s*$/.test(str)) {
         #{raise ArgumentError, "invalid value for Integer(): \"#{value}\""}
@@ -526,13 +522,27 @@ def Integer(value, base = undefined)
   end
 
   def Float(value)
-    if String === value
-      `parseFloat(value)`
-    elsif value.respond_to? :to_f
-      value.to_f
-    else
-      raise TypeError, "can't convert #{value.class} into Float"
-    end
+    %x{
+      var str;
+
+      if (value === nil) {
+        #{raise TypeError, "can't convert nil into Float"}
+      }
+
+      if (value.$$is_string) {
+        str = value.toString();
+
+        str = str.replace(/(\d)_(\d)/g, '$1$2');
+
+        if (!/^\s*[-+]?[0-9]*\.?[0-9]+([eE][-+]?[0-9]+)?\s*$/.test(str)) {
+          #{raise ArgumentError, "invalid value for Float(): \"#{value}\""}
+        }
+
+        return parseFloat(str);
+      }
+
+      return #{Opal.coerce_to!(value, Float, :to_f)};
+    }
   end
 
   def is_a?(klass)

diff --git a/opal/corelib/numeric.rb b/opal/corelib/numeric.rb
@@ -285,7 +285,10 @@ def downto(finish, &block)
   end
 
   alias eql? ==
-  alias equal? ==
+
+  def equal?(other)
+    self == other || `isNaN(self) && isNaN(other)`
+  end
 
   def even?
     `self % 2 === 0`

diff --git a/spec/filters/unsupported/float.rb b/spec/filters/unsupported/float.rb
@@ -3,4 +3,7 @@
   fails "Array#to_s represents a recursive element with '[...]'"
   fails "Array#eql? returns false if any corresponding elements are not #eql?"
   fails "Set#eql? returns true when the passed argument is a Set and contains the same elements"
+
+  fails "Kernel#Float raises a TypeError if #to_f returns an Integer"
+  fails "Kernel.Float raises a TypeError if #to_f returns an Integer"
 end
diff --git a/spec/filters/unsupported/private_methods.rb b/spec/filters/unsupported/private_methods.rb
@@ -41,5 +41,6 @@
   fails "Math#atanh is a private instance method"
 
   fails "Kernel#Integer is a private method"
+  fails "Kernel#Float is a private method"
   fails "Kernel#warn is a private method"
 end
diff --git a/spec/rubyspecs b/spec/rubyspecs
@@ -53,6 +53,7 @@ corelib/core/kernel/eql_spec
 corelib/core/kernel/equal_spec
 corelib/core/kernel/equal_value_spec
 corelib/core/kernel/Integer_spec
+corelib/core/kernel/Float_spec
 corelib/core/kernel/tap_spec
 corelib/core/kernel/to_s_spec
 corelib/core/kernel/warn_spec