JavaScriptCore-1097.13.tar.gz

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

diff --git a/runtime/Operations.cpp b/runtime/Operations.cpp
index 550d3f6b4af010433fb73ecb741ca39023690df4..4cb9de505e79660e34eded7ff2af01aeed3e7a5c 100644 (file)
--- a/runtime/Operations.cpp
+++ b/runtime/Operations.cpp
@@ -29,27 +29,85 @@
 #include <stdio.h>
 #include <wtf/MathExtras.h>
 
-#if HAVE(FLOAT_H)
-#include <float.h>
-#endif
-
 namespace JSC {
 
-bool JSValuePtr::equalSlowCase(ExecState* exec, JSValuePtr v1, JSValuePtr v2)
+bool JSValue::equalSlowCase(ExecState* exec, JSValue v1, JSValue v2)
 {
     return equalSlowCaseInline(exec, v1, v2);
 }
 
-bool JSValuePtr::strictEqualSlowCase(JSValuePtr v1, JSValuePtr v2)
+bool JSValue::strictEqualSlowCase(ExecState* exec, JSValue v1, JSValue v2)
+{
+    return strictEqualSlowCaseInline(exec, v1, v2);
+}
+
+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 jsString(callFrame, asString(p1), p2.toString(callFrame));
+
+    if (p2.isString())
+        return jsString(callFrame, p1.toString(callFrame), asString(p2));
+
+    return jsNumber(p1.toNumber(callFrame) + p2.toNumber(callFrame));
+}
+
+JSValue jsTypeStringForValue(CallFrame* callFrame, JSValue v)
 {
-    return strictEqualSlowCaseInline(v1, v2);
+    JSGlobalData& globalData = callFrame->globalData();
+    if (v.isUndefined())
+        return globalData.smallStrings.undefinedString(&globalData);
+    if (v.isBoolean())
+        return globalData.smallStrings.booleanString(&globalData);
+    if (v.isNumber())
+        return globalData.smallStrings.numberString(&globalData);
+    if (v.isString())
+        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())
+            return globalData.smallStrings.undefinedString(&globalData);
+        CallData callData;
+        JSObject* object = asObject(v);
+        if (object->methodTable()->getCallData(object, callData) != CallTypeNone)
+            return globalData.smallStrings.functionString(&globalData);
+    }
+    return globalData.smallStrings.objectString(&globalData);
+}
+
+bool jsIsObjectType(JSValue v)
+{
+    if (!v.isCell())
+        return v.isNull();
+
+    JSType type = v.asCell()->structure()->typeInfo().type();
+    if (type == NumberType || type == StringType)
+        return false;
+    if (type >= ObjectType) {
+        if (asObject(v)->structure()->typeInfo().masqueradesAsUndefined())
+            return false;
+        CallData callData;
+        JSObject* object = asObject(v);
+        if (object->methodTable()->getCallData(object, callData) != CallTypeNone)
+            return false;
+    }
+    return true;
 }
 
-NEVER_INLINE JSValuePtr throwOutOfMemoryError(ExecState* exec)
+bool jsIsFunctionType(JSValue v)
 {
-    JSObject* error = Error::create(exec, GeneralError, "Out of memory");
-    exec->setException(error);
-    return error;
+    if (v.isObject()) {
+        CallData callData;
+        JSObject* object = asObject(v);
+        if (object->methodTable()->getCallData(object, callData) != CallTypeNone)
+            return true;
+    }
+    return false;
 }
 
 } // namespace JSC