JavaScriptCore-1218.35.tar.gz

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

diff --git a/runtime/Operations.cpp b/runtime/Operations.cpp
index 550d3f6b4af010433fb73ecb741ca39023690df4..d6cc0ff57e492b4cd4abed0f5d5ffd2370217f18 100644 (file)
--- a/runtime/Operations.cpp
+++ b/runtime/Operations.cpp
@@ -29,27 +29,89 @@
 #include <stdio.h>
 #include <wtf/MathExtras.h>
 
 #include <stdio.h>
 #include <wtf/MathExtras.h>
 

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

 namespace JSC {
 
 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);
 }
 
 {
     return equalSlowCaseInline(exec, v1, v2);
 }
 

-bool JSValuePtr::strictEqualSlowCase(JSValuePtr v1, JSValuePtr v2)
+bool JSValue::strictEqualSlowCase(ExecState* exec, JSValue v1, JSValue v2)

 {
 {

-    return strictEqualSlowCaseInline(v1, 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(VM& vm, JSGlobalObject* globalObject, JSValue v)
+{
+    if (v.isUndefined())
+        return vm.smallStrings.undefinedString();
+    if (v.isBoolean())
+        return vm.smallStrings.booleanString();
+    if (v.isNumber())
+        return vm.smallStrings.numberString();
+    if (v.isString())
+        return vm.smallStrings.stringString();
+    if (v.isObject()) {
+        // Return "undefined" for objects that should be treated
+        // as null when doing comparisons.
+        if (asObject(v)->structure()->masqueradesAsUndefined(globalObject))
+            return vm.smallStrings.undefinedString();
+        CallData callData;
+        JSObject* object = asObject(v);
+        if (object->methodTable()->getCallData(object, callData) != CallTypeNone)
+            return vm.smallStrings.functionString();
+    }
+    return vm.smallStrings.objectString();
+}
+
+JSValue jsTypeStringForValue(CallFrame* callFrame, JSValue v)
+{
+    return jsTypeStringForValue(callFrame->vm(), callFrame->lexicalGlobalObject(), v);
+}
+
+bool jsIsObjectType(CallFrame* callFrame, JSValue v)
+{
+    if (!v.isCell())
+        return v.isNull();
+
+    JSType type = v.asCell()->structure()->typeInfo().type();
+    if (type == StringType)
+        return false;
+    if (type >= ObjectType) {
+        if (asObject(v)->structure()->masqueradesAsUndefined(callFrame->lexicalGlobalObject()))
+            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
 }
 
 } // namespace JSC