Changeset 33979 in webkit for trunk/JavaScriptCore/kjs/operations.cpp

Timestamp:

May 21, 2008, 6:20:45 PM (17 years ago)

Author:

[email protected]

Message:

Merge squirrelfish branch into trunk.

File:

• trunk/JavaScriptCore/kjs/operations.cpp (modified) (2 diffs)

trunk/JavaScriptCore/kjs/operations.cpp

@@ -99 +99 @@
 }
 
-bool strictEqual(ExecState *exec, JSValue *v1, JSValue *v2)
+bool strictEqual(JSValue* v1, JSValue* v2)
 {
     JSType t1 = v1->type();
@@ -106 +106 @@
     if (t1 != t2)
         return false;
-    if (t1 == UndefinedType || t1 == NullType)
-        return true;
-    if (t1 == NumberType) {
-        double n1 = v1->toNumber(exec);
-        double n2 = v2->toNumber(exec);
-        if (n1 == n2)
-            return true;
-        return false;
-    } else if (t1 == StringType)
-        return v1->toString(exec) == v2->toString(exec);
-    else if (t2 == BooleanType)
-        return v1->toBoolean(exec) == v2->toBoolean(exec);
+
+    if (t1 == NumberType)
+        return v1->getNumber() == v2->getNumber();
     
-    if (v1 == v2)
-        return true;
-    /* TODO: joined objects */
+    if (t1 == StringType)
+        return static_cast<StringImp*>(v1)->value() == static_cast<StringImp*>(v2)->value();
     
-    return false;
+    return v1 == v2; // covers object, boolean, null, and undefined types
+}
+
+JSValue* throwOutOfMemoryError(ExecState* exec)
+{
+    JSObject* error = Error::create(exec, GeneralError, "Out of memory");
+    exec->setException(error);
+    return error;
 }