convert first parse(Int|Float) argument to string before calling `$…

…trim`
zloirock · Jan 23, 2016 · 3d625c8 · 3d625c8
1 parent 38f373d
commit 3d625c8
Show file tree

Hide file tree

Showing 15 changed files with 52 additions and 12 deletions.
diff --git a/library/modules/_parse-float.js b/library/modules/_parse-float.js
@@ -2,7 +2,7 @@ var $parseFloat = require('./_global').parseFloat
   , $trim       = require('./_string-trim').trim;
 
 module.exports = 1 / $parseFloat('-0') !== -Infinity ? function parseFloat(str){
-  var string = $trim(str, 3)
+  var string = $trim(String(str), 3)
     , result = $parseFloat(string);
   return result === 0 && string.charAt(0) == '-' ? -0 : result;
 } : $parseFloat;
diff --git a/library/modules/_parse-int.js b/library/modules/_parse-int.js
@@ -4,6 +4,6 @@ var $parseInt = require('./_global').parseInt
   , hex       = /^[\-+]?0[xX]/;
 
 module.exports = $parseInt(ws + '08') !== 8 || $parseInt(ws + '0x16') !== 22 ? function parseInt(str, radix){
-  var string = $trim(str, 3);
+  var string = $trim(String(str), 3);
   return $parseInt(string, (radix >>> 0) || (hex.test(string) ? 16 : 10));
 } : $parseInt;
diff --git a/modules/_parse-float.js b/modules/_parse-float.js
@@ -2,7 +2,7 @@ var $parseFloat = require('./_global').parseFloat
   , $trim       = require('./_string-trim').trim;
 
 module.exports = 1 / $parseFloat('-0') !== -Infinity ? function parseFloat(str){
-  var string = $trim(str, 3)
+  var string = $trim(String(str), 3)
     , result = $parseFloat(string);
   return result === 0 && string.charAt(0) == '-' ? -0 : result;
 } : $parseFloat;
diff --git a/modules/_parse-int.js b/modules/_parse-int.js
@@ -4,6 +4,6 @@ var $parseInt = require('./_global').parseInt
   , hex       = /^[\-+]?0[xX]/;
 
 module.exports = $parseInt(ws + '08') !== 8 || $parseInt(ws + '0x16') !== 22 ? function parseInt(str, radix){
-  var string = $trim(str, 3);
+  var string = $trim(String(str), 3);
   return $parseInt(string, (radix >>> 0) || (hex.test(string) ? 16 : 10));
 } : $parseInt;
diff --git a/tests/es.js b/tests/es.js
diff --git a/tests/library.js b/tests/library.js
diff --git a/tests/library/es6.number.parse-float.ls b/tests/library/es6.number.parse-float.ls
@@ -10,4 +10,6 @@ test 'Number.parseFloat' (assert)!->
   assert.same parseFloat('+0'), 0
   assert.same parseFloat(' +0'), 0
   assert.same parseFloat('-0'), -0
-  assert.same parseFloat(' -0'), -0
+  assert.same parseFloat(' -0'), -0
+  assert.same parseFloat(null), NaN
+  assert.same parseFloat(void), NaN
diff --git a/tests/library/es6.number.parse-int.ls b/tests/library/es6.number.parse-int.ls
@@ -23,4 +23,6 @@ test 'Number.parseInt' (assert)!->
   assert.same parseInt('-0xF', 16), -15, 'signed hex #2'
   assert.same parseInt('+0xF'), 15, 'signed hex #3'
   assert.same parseInt('+0xF' 16), 15, 'signed hex #4'
-  assert.same parseInt('10', -4294967294), 2, 'radix uses ToUint32'
+  assert.same parseInt('10', -4294967294), 2, 'radix uses ToUint32'
+  assert.same parseInt(null), NaN
+  assert.same parseInt(void), NaN
diff --git a/tests/library/es6.parse-float.ls b/tests/library/es6.parse-float.ls
@@ -10,4 +10,6 @@ test 'parseFloat' (assert)!->
   assert.same parseFloat('+0'), 0
   assert.same parseFloat(' +0'), 0
   assert.same parseFloat('-0'), -0
-  assert.same parseFloat(' -0'), -0
+  assert.same parseFloat(' -0'), -0
+  assert.same parseFloat(null), NaN
+  assert.same parseFloat(void), NaN
diff --git a/tests/library/es6.parse-int.ls b/tests/library/es6.parse-int.ls
@@ -23,4 +23,6 @@ test 'parseInt' (assert)!->
   assert.same parseInt('-0xF', 16), -15, 'signed hex #2'
   assert.same parseInt('+0xF'), 15, 'signed hex #3'
   assert.same parseInt('+0xF' 16), 15, 'signed hex #4'
-  assert.same parseInt('10', -4294967294), 2, 'radix uses ToUint32'
+  assert.same parseInt('10', -4294967294), 2, 'radix uses ToUint32'
+  assert.same parseInt(null), NaN
+  assert.same parseInt(void), NaN
diff --git a/tests/tests.js b/tests/tests.js
diff --git a/tests/tests/es6.number.parse-float.ls b/tests/tests/es6.number.parse-float.ls
@@ -12,4 +12,6 @@ test 'Number.parseFloat' (assert)!->
   assert.same parseFloat('+0'), 0
   assert.same parseFloat(' +0'), 0
   assert.same parseFloat('-0'), -0
-  assert.same parseFloat(' -0'), -0
+  assert.same parseFloat(' -0'), -0
+  assert.same parseFloat(null), NaN
+  assert.same parseFloat(void), NaN
diff --git a/tests/tests/es6.number.parse-int.ls b/tests/tests/es6.number.parse-int.ls
@@ -25,4 +25,6 @@ test 'Number.parseInt' (assert)!->
   assert.same parseInt('-0xF', 16), -15, 'signed hex #2'
   assert.same parseInt('+0xF'), 15, 'signed hex #3'
   assert.same parseInt('+0xF' 16), 15, 'signed hex #4'
-  assert.same parseInt('10', -4294967294), 2, 'radix uses ToUint32'
+  assert.same parseInt('10', -4294967294), 2, 'radix uses ToUint32'
+  assert.same parseInt(null), NaN
+  assert.same parseInt(void), NaN
diff --git a/tests/tests/es6.parse-float.ls b/tests/tests/es6.parse-float.ls
@@ -11,4 +11,6 @@ test 'parseFloat' (assert)!->
   assert.same parseFloat('+0'), 0
   assert.same parseFloat(' +0'), 0
   assert.same parseFloat('-0'), -0
-  assert.same parseFloat(' -0'), -0
+  assert.same parseFloat(' -0'), -0
+  assert.same parseFloat(null), NaN
+  assert.same parseFloat(void), NaN
diff --git a/tests/tests/es6.parse-int.ls b/tests/tests/es6.parse-int.ls
@@ -24,4 +24,6 @@ test 'parseInt' (assert)!->
   assert.same parseInt('-0xF', 16), -15, 'signed hex #2'
   assert.same parseInt('+0xF'), 15, 'signed hex #3'
   assert.same parseInt('+0xF' 16), 15, 'signed hex #4'
-  assert.same parseInt('10', -4294967294), 2, 'radix uses ToUint32'
+  assert.same parseInt('10', -4294967294), 2, 'radix uses ToUint32'
+  assert.same parseInt(null), NaN
+  assert.same parseInt(void), NaN