JavaScriptCore-1218.34.tar.gz

[apple/javascriptcore.git] / runtime / Operations.cpp

diff --git a/runtime/Operations.cpp b/runtime/Operations.cpp
index 0e1887c0f991835a998297b55346dd8bc79bf49c..d6cc0ff57e492b4cd4abed0f5d5ffd2370217f18 100644 (file)
--- a/runtime/Operations.cpp
+++ b/runtime/Operations.cpp
@@ -41,65 +41,63 @@ bool JSValue::strictEqualSlowCase(ExecState* exec, JSValue v1, JSValue v2)
     return strictEqualSlowCaseInline(exec, v1, v2);
 }
 
     return strictEqualSlowCaseInline(exec, v1, v2);
 }
 

-NEVER_INLINE JSValue throwOutOfMemoryError(ExecState* exec)
-{
-    JSObject* error = Error::create(exec, GeneralError, "Out of memory");
-    exec->setException(error);
-    return error;
-}
-

 NEVER_INLINE JSValue jsAddSlowCase(CallFrame* callFrame, JSValue v1, JSValue v2)
 {
     // exception for the Date exception in defaultValue()
     JSValue p1 = v1.toPrimitive(callFrame);
     JSValue p2 = v2.toPrimitive(callFrame);
 
 NEVER_INLINE JSValue jsAddSlowCase(CallFrame* callFrame, JSValue v1, JSValue v2)
 {
     // exception for the Date exception in defaultValue()
     JSValue p1 = v1.toPrimitive(callFrame);
     JSValue p2 = v2.toPrimitive(callFrame);
 

-    if (p1.isString()) {
-        return p2.isString()
-            ? jsString(callFrame, asString(p1), asString(p2))
-            : jsString(callFrame, asString(p1), p2.toString(callFrame));
-    }
+    if (p1.isString())
+        return jsString(callFrame, asString(p1), p2.toString(callFrame));
+

     if (p2.isString())
         return jsString(callFrame, p1.toString(callFrame), asString(p2));
 
     if (p2.isString())
         return jsString(callFrame, p1.toString(callFrame), asString(p2));
 

-    return jsNumber(callFrame, p1.toNumber(callFrame) + p2.toNumber(callFrame));
+    return jsNumber(p1.toNumber(callFrame) + p2.toNumber(callFrame));

 }
 
 }
 

-JSValue jsTypeStringForValue(CallFrame* callFrame, JSValue v)
+JSValue jsTypeStringForValue(VM& vm, JSGlobalObject* globalObject, JSValue v)

 {
     if (v.isUndefined())
 {
     if (v.isUndefined())

-        return jsNontrivialString(callFrame, "undefined");
+        return vm.smallStrings.undefinedString();

     if (v.isBoolean())
     if (v.isBoolean())

-        return jsNontrivialString(callFrame, "boolean");
+        return vm.smallStrings.booleanString();

     if (v.isNumber())
     if (v.isNumber())

-        return jsNontrivialString(callFrame, "number");
+        return vm.smallStrings.numberString();

     if (v.isString())
     if (v.isString())

-        return jsNontrivialString(callFrame, "string");
+        return vm.smallStrings.stringString();

     if (v.isObject()) {
         // Return "undefined" for objects that should be treated
         // as null when doing comparisons.
     if (v.isObject()) {
         // Return "undefined" for objects that should be treated
         // as null when doing comparisons.

-        if (asObject(v)->structure()->typeInfo().masqueradesAsUndefined())
-            return jsNontrivialString(callFrame, "undefined");
+        if (asObject(v)->structure()->masqueradesAsUndefined(globalObject))
+            return vm.smallStrings.undefinedString();

         CallData callData;
         CallData callData;

-        if (asObject(v)->getCallData(callData) != CallTypeNone)
-            return jsNontrivialString(callFrame, "function");
+        JSObject* object = asObject(v);
+        if (object->methodTable()->getCallData(object, callData) != CallTypeNone)
+            return vm.smallStrings.functionString();

     }
     }

-    return jsNontrivialString(callFrame, "object");
+    return vm.smallStrings.objectString();
+}
+
+JSValue jsTypeStringForValue(CallFrame* callFrame, JSValue v)
+{
+    return jsTypeStringForValue(callFrame->vm(), callFrame->lexicalGlobalObject(), v);

 }
 
 }
 

-bool jsIsObjectType(JSValue v)
+bool jsIsObjectType(CallFrame* callFrame, JSValue v)

 {
     if (!v.isCell())
         return v.isNull();
 
 {
     if (!v.isCell())
         return v.isNull();
 

-    JSType type = asCell(v)->structure()->typeInfo().type();
-    if (type == NumberType || type == StringType)
+    JSType type = v.asCell()->structure()->typeInfo().type();
+    if (type == StringType)

         return false;
         return false;

-    if (type == ObjectType) {
-        if (asObject(v)->structure()->typeInfo().masqueradesAsUndefined())
+    if (type >= ObjectType) {
+        if (asObject(v)->structure()->masqueradesAsUndefined(callFrame->lexicalGlobalObject()))

             return false;
         CallData callData;
             return false;
         CallData callData;

-        if (asObject(v)->getCallData(callData) != CallTypeNone)
+        JSObject* object = asObject(v);
+        if (object->methodTable()->getCallData(object, callData) != CallTypeNone)

             return false;
     }
     return true;
             return false;
     }
     return true;


@@ -109,7 +107,8 @@ bool jsIsFunctionType(JSValue v)
 {
     if (v.isObject()) {
         CallData callData;
 {
     if (v.isObject()) {
         CallData callData;

-        if (asObject(v)->getCallData(callData) != CallTypeNone)
+        JSObject* object = asObject(v);
+        if (object->methodTable()->getCallData(object, callData) != CallTypeNone)

             return true;
     }
     return false;
             return true;
     }
     return false;