Changeset 33979 in webkit for trunk/JavaScriptCore/kjs/JSImmediate.h

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.h (modified) (3 diffs)

trunk/JavaScriptCore/kjs/JSImmediate.h

@@ -123 +123 @@
     static JSValue* undefinedImmediate();
     static JSValue* nullImmediate();
+
+    static JSValue* impossibleValue();
     
 private:
@@ -152 +154 @@
 ALWAYS_INLINE JSValue* JSImmediate::undefinedImmediate() { return tag(1 << 2, UndefinedType); }
 ALWAYS_INLINE JSValue* JSImmediate::nullImmediate() { return tag(0, UndefinedType); }
+
+// This value is impossible because 0x4 is not a valid pointer but a tag of 0 would indicate non-immediate
+ALWAYS_INLINE JSValue* JSImmediate::impossibleValue() { return tag(1 << 2, 0); }
 
 ALWAYS_INLINE bool JSImmediate::toBoolean(const JSValue* v)
@@ -274 +279 @@
 }
 
+ALWAYS_INLINE JSType JSImmediate::type(const JSValue* v)
+{
+    ASSERT(isImmediate(v));
+    
+    uintptr_t tag = getTag(v);
+    if (tag == UndefinedType)
+        return v == undefinedImmediate() ? UndefinedType : NullType;
+    return static_cast<JSType>(tag);
+}
+
 } // namespace KJS