Revision: 6111
Author: [email protected]
Date: Wed Dec 22 05:19:25 2010
Log: Introduce NUMBER_IS_FINITE macro to avoid ToNumber() conversion.
Review URL: http://codereview.chromium.org/5977006
http://code.google.com/p/v8/source/detail?r=6111
Modified:
/branches/bleeding_edge/src/date.js
/branches/bleeding_edge/src/json.js
/branches/bleeding_edge/src/macros.py
/branches/bleeding_edge/src/mirror-debugger.js
/branches/bleeding_edge/src/string.js
=======================================
--- /branches/bleeding_edge/src/date.js Fri Dec 17 04:45:27 2010
+++ /branches/bleeding_edge/src/date.js Wed Dec 22 05:19:25 2010
@@ -1000,7 +1000,7 @@
function DateToJSON(key) {
var o = ToObject(this);
var tv = DefaultNumber(o);
- if (IS_NUMBER(tv) && !$isFinite(tv)) {
+ if (IS_NUMBER(tv) && !NUMBER_IS_FINITE(tv)) {
return null;
}
return o.toISOString();
=======================================
--- /branches/bleeding_edge/src/json.js Wed Dec 15 01:31:05 2010
+++ /branches/bleeding_edge/src/json.js Wed Dec 22 05:19:25 2010
@@ -27,11 +27,6 @@
var $JSON = global.JSON;
-function ParseJSONUnfiltered(text) {
- var s = $String(text);
- return %ParseJson(s);
-}
-
function Revive(holder, name, reviver) {
var val = holder[name];
if (IS_OBJECT(val)) {
@@ -58,7 +53,7 @@
}
function JSONParse(text, reviver) {
- var unfiltered = ParseJSONUnfiltered(text);
+ var unfiltered = %ParseJson(TO_STRING_INLINE(text));
if (IS_FUNCTION(reviver)) {
return Revive({'': unfiltered}, '', reviver);
} else {
@@ -158,7 +153,7 @@
if (IS_STRING(value)) {
return %QuoteJSONString(value);
} else if (IS_NUMBER(value)) {
- return $isFinite(value) ? $String(value) : "null";
+ return NUMBER_IS_FINITE(value) ? $String(value) : "null";
} else if (IS_BOOLEAN(value)) {
return value ? "true" : "false";
} else if (IS_NULL(value)) {
@@ -169,7 +164,7 @@
return SerializeArray(value, replacer, stack, indent, gap);
} else if (IS_NUMBER_WRAPPER(value)) {
value = ToNumber(value);
- return $isFinite(value) ? ToString(value) : "null";
+ return NUMBER_IS_FINITE(value) ? ToString(value) : "null";
} else if (IS_STRING_WRAPPER(value)) {
return %QuoteJSONString(ToString(value));
} else if (IS_BOOLEAN_WRAPPER(value)) {
@@ -244,7 +239,7 @@
if (IS_STRING(value)) {
builder.push(%QuoteJSONString(value));
} else if (IS_NUMBER(value)) {
- builder.push(($isFinite(value) ? %_NumberToString(value) : "null"));
+
builder.push(NUMBER_IS_FINITE(value) ? %_NumberToString(value) : "null");
} else if (IS_BOOLEAN(value)) {
builder.push(value ? "true" : "false");
} else if (IS_NULL(value)) {
@@ -254,7 +249,7 @@
// Unwrap value if necessary
if (IS_NUMBER_WRAPPER(value)) {
value = ToNumber(value);
- builder.push(($isFinite(value) ? %_NumberToString(value) : "null"));
+
builder.push(NUMBER_IS_FINITE(value) ? %_NumberToString(value) : "null");
} else if (IS_STRING_WRAPPER(value)) {
builder.push(%QuoteJSONString(ToString(value)));
} else if (IS_BOOLEAN_WRAPPER(value)) {
=======================================
--- /branches/bleeding_edge/src/macros.py Thu Dec 16 05:02:09 2010
+++ /branches/bleeding_edge/src/macros.py Wed Dec 22 05:19:25 2010
@@ -120,6 +120,7 @@
# Inline macros. Use %IS_VAR to make sure arg is evaluated only once.
macro NUMBER_IS_NAN(arg) = (!%_IsSmi(%IS_VAR(arg)) && !(arg == arg));
+macro NUMBER_IS_FINITE(arg) = (%_IsSmi(%IS_VAR(arg)) || arg - arg == 0);
macro TO_INTEGER(arg) = (%_IsSmi(%IS_VAR(arg)) ?
arg : %NumberToInteger(ToNumber(arg)));
macro TO_INTEGER_MAP_MINUS_ZERO(arg) = (%_IsSmi(%IS_VAR(arg)) ?
arg : %NumberToIntegerMapMinusZero(ToNumber(arg)));
macro TO_INT32(arg) = (%_IsSmi(%IS_VAR(arg)) ? arg : (arg >> 0));
=======================================
--- /branches/bleeding_edge/src/mirror-debugger.js Mon Dec 13 16:07:44 2010
+++ /branches/bleeding_edge/src/mirror-debugger.js Wed Dec 22 05:19:25 2010
@@ -2369,7 +2369,7 @@
if (isNaN(value)) {
return 'NaN';
}
- if (!isFinite(value)) {
+ if (!NUMBER_IS_FINITE(value)) {
if (value > 0) {
return 'Infinity';
} else {
=======================================
--- /branches/bleeding_edge/src/string.js Fri Dec 17 03:57:10 2010
+++ /branches/bleeding_edge/src/string.js Wed Dec 22 05:19:25 2010
@@ -127,7 +127,7 @@
var index = subLength - patLength;
if (%_ArgumentsLength() > 1) {
var position = ToNumber(%_Arguments(1));
- if (!$isNaN(position)) {
+ if (!NUMBER_IS_NAN(position)) {
position = TO_INTEGER(position);
if (position < 0) {
position = 0;
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
