JavaScriptCore-1097.13.tar.gz

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

diff --git a/runtime/Operations.cpp b/runtime/Operations.cpp
index 093bbecf389cae30a5c128007d44ec14b642900d..4cb9de505e79660e34eded7ff2af01aeed3e7a5c 100644 (file)
--- a/runtime/Operations.cpp
+++ b/runtime/Operations.cpp
@@ -29,10 +29,6 @@
 #include <stdio.h>
 #include <wtf/MathExtras.h>
 
 #include <stdio.h>
 #include <wtf/MathExtras.h>
 

-#if HAVE(FLOAT_H)
-#include <float.h>
-#endif
-

 namespace JSC {
 
 bool JSValue::equalSlowCase(ExecState* exec, JSValue v1, JSValue v2)
 namespace JSC {
 
 bool JSValue::equalSlowCase(ExecState* exec, JSValue v1, JSValue v2)


@@ -40,16 +36,9 @@ bool JSValue::equalSlowCase(ExecState* exec, JSValue v1, JSValue v2)
     return equalSlowCaseInline(exec, v1, v2);
 }
 
     return equalSlowCaseInline(exec, v1, v2);
 }
 

-bool JSValue::strictEqualSlowCase(JSValue v1, JSValue v2)
-{
-    return strictEqualSlowCaseInline(v1, v2);
-}
-
-NEVER_INLINE JSValue throwOutOfMemoryError(ExecState* exec)
+bool JSValue::strictEqualSlowCase(ExecState* exec, JSValue v1, JSValue v2)

 {
 {

-    JSObject* error = Error::create(exec, GeneralError, "Out of memory");
-    exec->setException(error);
-    return error;
+    return strictEqualSlowCaseInline(exec, v1, v2);

 }
 
 NEVER_INLINE JSValue jsAddSlowCase(CallFrame* callFrame, JSValue v1, JSValue v2)
 }
 
 NEVER_INLINE JSValue jsAddSlowCase(CallFrame* callFrame, JSValue v1, JSValue v2)


@@ -58,36 +47,37 @@ NEVER_INLINE JSValue jsAddSlowCase(CallFrame* callFrame, JSValue v1, JSValue v2)
     JSValue p1 = v1.toPrimitive(callFrame);
     JSValue p2 = v2.toPrimitive(callFrame);
 
     JSValue p1 = v1.toPrimitive(callFrame);
     JSValue p2 = v2.toPrimitive(callFrame);
 

-    if (p1.isString() || p2.isString()) {
-        RefPtr<UString::Rep> value = concatenate(p1.toString(callFrame).rep(), p2.toString(callFrame).rep());
-        if (!value)
-            return throwOutOfMemoryError(callFrame);
-        return jsString(callFrame, value.release());
-    }
+    if (p1.isString())
+        return jsString(callFrame, asString(p1), p2.toString(callFrame));
+
+    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(CallFrame* callFrame, JSValue v)
 {

+    JSGlobalData& globalData = callFrame->globalData();

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

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

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

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

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

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

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

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

     if (v.isObject()) {
         // Return "undefined" for objects that should be treated
         // as null when doing comparisons.
         if (asObject(v)->structure()->typeInfo().masqueradesAsUndefined())
     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");
+            return globalData.smallStrings.undefinedString(&globalData);

         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 globalData.smallStrings.functionString(&globalData);

     }
     }

-    return jsNontrivialString(callFrame, "object");
+    return globalData.smallStrings.objectString(&globalData);

 }
 
 bool jsIsObjectType(JSValue v)
 }
 
 bool jsIsObjectType(JSValue v)


@@ -95,14 +85,15 @@ bool jsIsObjectType(JSValue v)
     if (!v.isCell())
         return v.isNull();
 
     if (!v.isCell())
         return v.isNull();
 

-    JSType type = asCell(v)->structure()->typeInfo().type();
+    JSType type = v.asCell()->structure()->typeInfo().type();

     if (type == NumberType || type == StringType)
         return false;
     if (type == NumberType || type == StringType)
         return false;

-    if (type == ObjectType) {
+    if (type >= ObjectType) {

         if (asObject(v)->structure()->typeInfo().masqueradesAsUndefined())
             return false;
         CallData callData;
         if (asObject(v)->structure()->typeInfo().masqueradesAsUndefined())
             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;


@@ -112,7 +103,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;