Changeset 32807 in webkit for trunk/JavaScriptCore/kjs/number_object.cpp

Timestamp:

May 2, 2008, 3:07:53 AM (17 years ago)

Author:

[email protected]

Message:

Reviewed by Geoffrey Garen.

​https://bugs.webkit.org/show_bug.cgi?id=18826
Make JavaScript heap per-thread

File:

• trunk/JavaScriptCore/kjs/number_object.cpp (modified) (18 diffs)

trunk/JavaScriptCore/kjs/number_object.cpp

@@ -56 +56 @@
     : NumberInstance(objectPrototype)
 {
-    setInternalValue(jsNumber(0));
+    setInternalValue(jsNumber(exec, 0));
 
     // The constructor will be added later, after NumberObjectImp has been constructed
 
-    putDirectFunction(new PrototypeFunction(exec, functionPrototype, 1, exec->propertyNames().toString, numberProtoFuncToString), DontEnum);
-    putDirectFunction(new PrototypeFunction(exec, functionPrototype, 0, exec->propertyNames().toLocaleString, numberProtoFuncToLocaleString), DontEnum);
-    putDirectFunction(new PrototypeFunction(exec, functionPrototype, 0, exec->propertyNames().valueOf, numberProtoFuncValueOf), DontEnum);
-    putDirectFunction(new PrototypeFunction(exec, functionPrototype, 1, exec->propertyNames().toFixed, numberProtoFuncToFixed), DontEnum);
-    putDirectFunction(new PrototypeFunction(exec, functionPrototype, 1, exec->propertyNames().toExponential, numberProtoFuncToExponential), DontEnum);
-    putDirectFunction(new PrototypeFunction(exec, functionPrototype, 1, exec->propertyNames().toPrecision, numberProtoFuncToPrecision), DontEnum);
+    putDirectFunction(new (exec) PrototypeFunction(exec, functionPrototype, 1, exec->propertyNames().toString, numberProtoFuncToString), DontEnum);
+    putDirectFunction(new (exec) PrototypeFunction(exec, functionPrototype, 0, exec->propertyNames().toLocaleString, numberProtoFuncToLocaleString), DontEnum);
+    putDirectFunction(new (exec) PrototypeFunction(exec, functionPrototype, 0, exec->propertyNames().valueOf, numberProtoFuncValueOf), DontEnum);
+    putDirectFunction(new (exec) PrototypeFunction(exec, functionPrototype, 1, exec->propertyNames().toFixed, numberProtoFuncToFixed), DontEnum);
+    putDirectFunction(new (exec) PrototypeFunction(exec, functionPrototype, 1, exec->propertyNames().toExponential, numberProtoFuncToExponential), DontEnum);
+    putDirectFunction(new (exec) PrototypeFunction(exec, functionPrototype, 1, exec->propertyNames().toPrecision, numberProtoFuncToPrecision), DontEnum);
 }
 
@@ -152 +152 @@
     double radixAsDouble = args[0]->toInteger(exec); // nan -> 0
     if (radixAsDouble == 10 || args[0]->isUndefined())
-        return jsString(v->toString(exec));
+        return jsString(exec, v->toString(exec));
 
     if (radixAsDouble < 2 || radixAsDouble > 36)
@@ -166 +166 @@
     double x = v->toNumber(exec);
     if (isnan(x) || isinf(x))
-        return jsString(UString::from(x));
+        return jsString(exec, UString::from(x));
 
     bool isNegative = x < 0.0;
@@ -205 +205 @@
     ASSERT(p < s + sizeof(s));
 
-    return jsString(startOfResultString);
+    return jsString(exec, startOfResultString);
 }
 
@@ -214 +214 @@
 
     // TODO
-    return jsString(static_cast<NumberInstance*>(thisObj)->internalValue()->toString(exec));
+    return jsString(exec, static_cast<NumberInstance*>(thisObj)->internalValue()->toString(exec));
 }
 
@@ -240 +240 @@
     double x = v->toNumber(exec);
     if (isnan(x))
-        return jsString("NaN");
+        return jsString(exec, "NaN");
 
     UString s;
@@ -250 +250 @@
 
     if (x >= pow(10.0, 21.0))
-        return jsString(s + UString::from(x));
+        return jsString(exec, s + UString::from(x));
 
     const double tenToTheF = pow(10.0, f);
@@ -270 +270 @@
     int kMinusf = k - f;
     if (kMinusf < m.size())
-        return jsString(s + m.substr(0, kMinusf) + "." + m.substr(kMinusf));
-    return jsString(s + m.substr(0, kMinusf));
+        return jsString(exec, s + m.substr(0, kMinusf) + "." + m.substr(kMinusf));
+    return jsString(exec, s + m.substr(0, kMinusf));
 }
 
@@ -321 +321 @@
 
     if (isnan(x) || isinf(x))
-        return jsString(UString::from(x));
+        return jsString(exec, UString::from(x));
 
     JSValue* fractionalDigitsValue = args[0];
@@ -347 +347 @@
 
     if (isnan(x))
-        return jsString("NaN");
+        return jsString(exec, "NaN");
 
     if (x == -0.0) // (-0.0).toExponential() should print as 0 instead of -0
@@ -379 +379 @@
     freedtoa(result);
 
-    return jsString(buf);
+    return jsString(exec, buf);
 }
 
@@ -392 +392 @@
     double x = v->toNumber(exec);
     if (args[0]->isUndefined() || isnan(x) || isinf(x))
-        return jsString(v->toString(exec));
+        return jsString(exec, v->toString(exec));
 
     UString s;
@@ -431 +431 @@
                 m = m.substr(0, 1) + "." + m.substr(1);
             if (e >= 0)
-                return jsString(s + m + "e+" + UString::from(e));
-            return jsString(s + m + "e-" + UString::from(-e));
+                return jsString(exec, s + m + "e+" + UString::from(e));
+            return jsString(exec, s + m + "e-" + UString::from(-e));
         }
     } else {
@@ -440 +440 @@
 
     if (e == precision - 1)
-        return jsString(s + m);
+        return jsString(exec, s + m);
     if (e >= 0) {
         if (e + 1 < m.size())
-            return jsString(s + m.substr(0, e + 1) + "." + m.substr(e + 1));
-        return jsString(s + m);
-    }
-    return jsString(s + "0." + char_sequence('0', -(e + 1)) + m);
+            return jsString(exec, s + m.substr(0, e + 1) + "." + m.substr(e + 1));
+        return jsString(exec, s + m);
+    }
+    return jsString(exec, s + "0." + char_sequence('0', -(e + 1)) + m);
 }
 
@@ -469 +469 @@
 
     // no. of arguments for constructor
-    putDirect(exec->propertyNames().length, jsNumber(1), ReadOnly|DontDelete|DontEnum);
+    putDirect(exec->propertyNames().length, jsNumber(exec, 1), ReadOnly|DontDelete|DontEnum);
 }
 
@@ -477 +477 @@
 }
 
-JSValue* NumberObjectImp::getValueProperty(ExecState*, int token) const
+JSValue* NumberObjectImp::getValueProperty(ExecState* exec, int token) const
 {
     // ECMA 15.7.3
     switch (token) {
         case NaNValue:
-            return jsNaN();
+            return jsNaN(exec);
         case NegInfinity:
-            return jsNumberCell(-Inf);
+            return jsNumberCell(exec, -Inf);
         case PosInfinity:
-            return jsNumberCell(Inf);
+            return jsNumberCell(exec, Inf);
         case MaxValue:
-            return jsNumberCell(1.7976931348623157E+308);
+            return jsNumberCell(exec, 1.7976931348623157E+308);
         case MinValue:
-            return jsNumberCell(5E-324);
+            return jsNumberCell(exec, 5E-324);
     }
     ASSERT_NOT_REACHED();
@@ -505 +505 @@
 {
     JSObject* proto = exec->lexicalGlobalObject()->numberPrototype();
-    NumberInstance* obj = new NumberInstance(proto);
+    NumberInstance* obj = new (exec) NumberInstance(proto);
 
     // FIXME: Check args[0]->isUndefined() instead of args.isEmpty()?
     double n = args.isEmpty() ? 0 : args[0]->toNumber(exec);
-    obj->setInternalValue(jsNumber(n));
+    obj->setInternalValue(jsNumber(exec, n));
     return obj;
 }
@@ -517 +517 @@
 {
     // FIXME: Check args[0]->isUndefined() instead of args.isEmpty()?
-    return jsNumber(args.isEmpty() ? 0 : args[0]->toNumber(exec));
+    return jsNumber(exec, args.isEmpty() ? 0 : args[0]->toNumber(exec));
 }