Changeset 33979 in webkit for trunk/JavaScriptCore/kjs/JSImmediate.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/JSImmediate.cpp (modified) (3 diffs)

trunk/JavaScriptCore/kjs/JSImmediate.cpp

@@ -24 +24 @@
 #include "JSGlobalObject.h"
 #include "bool_object.h"
+#include "JSNotAnObject.h"
 #include "number_object.h"
 #include "object.h"
@@ -33 +34 @@
     ASSERT(isImmediate(v));
     if (v == jsNull())
-        return throwError(exec, TypeError, "Null value");
+        return new JSNotAnObject(throwError(exec, TypeError, "Null value"));
     else if (v == jsUndefined())
-        return throwError(exec, TypeError, "Undefined value");
+        return new JSNotAnObject(throwError(exec, TypeError, "Undefined value"));
     else if (isBoolean(v)) {
         List args;
@@ -63 +64 @@
 }
 
-JSType JSImmediate::type(const JSValue *v)
-{
-    ASSERT(isImmediate(v));
-    
-    uintptr_t tag = getTag(v);
-    if (tag == UndefinedType)
-        return v == jsUndefined() ? UndefinedType : NullType;
-    return static_cast<JSType>(tag);
-}
-
 } // namespace KJS