JavaScriptCore-576.tar.gz

[apple/javascriptcore.git] / API / JSValueRef.cpp

diff --git a/API/JSValueRef.cpp b/API/JSValueRef.cpp
index 468a2d14b6e52977a160861d95f9ab8c76ea02d5..a12cc3409a2e10dd5ef6c8986fe187e6bdf8276a 100644 (file)
--- a/API/JSValueRef.cpp
+++ b/API/JSValueRef.cpp
@@ -1,4 +1,3 @@
-// -*- mode: c++; c-basic-offset: 4 -*-

 /*
  * Copyright (C) 2006, 2007 Apple Inc. All rights reserved.
  *
 /*
  * Copyright (C) 2006, 2007 Apple Inc. All rights reserved.
  *


@@ -29,85 +28,105 @@
 
 #include <wtf/Platform.h>
 #include "APICast.h"
 
 #include <wtf/Platform.h>
 #include "APICast.h"

+#include "APIShims.h"

 #include "JSCallbackObject.h"
 
 #include "JSCallbackObject.h"
 

-#include <kjs/JSType.h>
-#include <kjs/JSGlobalObject.h>
-#include <kjs/internal.h>
-#include <kjs/operations.h>
-#include <kjs/protect.h>
-#include <kjs/ustring.h>
-#include <kjs/value.h>
+#include <runtime/JSGlobalObject.h>
+#include <runtime/JSString.h>
+#include <runtime/Operations.h>
+#include <runtime/Protect.h>
+#include <runtime/UString.h>
+#include <runtime/JSValue.h>

 
 #include <wtf/Assertions.h>
 
 #include <algorithm> // for std::min
 
 
 #include <wtf/Assertions.h>
 
 #include <algorithm> // for std::min
 

-JSType JSValueGetType(JSContextRef, JSValueRef value)
+using namespace JSC;
+
+::JSType JSValueGetType(JSContextRef ctx, JSValueRef value)

 {
 {

-    KJS::JSValue* jsValue = toJS(value);
-    switch (jsValue->type()) {
-        case KJS::UndefinedType:
-            return kJSTypeUndefined;
-        case KJS::NullType:
-            return kJSTypeNull;
-        case KJS::BooleanType:
-            return kJSTypeBoolean;
-        case KJS::NumberType:
-            return kJSTypeNumber;
-        case KJS::StringType:
-            return kJSTypeString;
-        case KJS::ObjectType:
-            return kJSTypeObject;
-        default:
-            ASSERT(!"JSValueGetType: unknown type code.\n");
-            return kJSTypeUndefined;
-    }
-}
+    ExecState* exec = toJS(ctx);
+    APIEntryShim entryShim(exec);
+
+    JSValue jsValue = toJS(exec, value);

 
 

-using namespace KJS; // placed here to avoid conflict between KJS::JSType and JSType, above.
+    if (jsValue.isUndefined())
+        return kJSTypeUndefined;
+    if (jsValue.isNull())
+        return kJSTypeNull;
+    if (jsValue.isBoolean())
+        return kJSTypeBoolean;
+    if (jsValue.isNumber())
+        return kJSTypeNumber;
+    if (jsValue.isString())
+        return kJSTypeString;
+    ASSERT(jsValue.isObject());
+    return kJSTypeObject;
+}

 
 

-bool JSValueIsUndefined(JSContextRef, JSValueRef value)
+bool JSValueIsUndefined(JSContextRef ctx, JSValueRef value)

 {
 {

-    JSValue* jsValue = toJS(value);
-    return jsValue->isUndefined();
+    ExecState* exec = toJS(ctx);
+    APIEntryShim entryShim(exec);
+
+    JSValue jsValue = toJS(exec, value);
+    return jsValue.isUndefined();

 }
 
 }
 

-bool JSValueIsNull(JSContextRef, JSValueRef value)
+bool JSValueIsNull(JSContextRef ctx, JSValueRef value)

 {
 {

-    JSValue* jsValue = toJS(value);
-    return jsValue->isNull();
+    ExecState* exec = toJS(ctx);
+    APIEntryShim entryShim(exec);
+
+    JSValue jsValue = toJS(exec, value);
+    return jsValue.isNull();

 }
 
 }
 

-bool JSValueIsBoolean(JSContextRef, JSValueRef value)
+bool JSValueIsBoolean(JSContextRef ctx, JSValueRef value)

 {
 {

-    JSValue* jsValue = toJS(value);
-    return jsValue->isBoolean();
+    ExecState* exec = toJS(ctx);
+    APIEntryShim entryShim(exec);
+
+    JSValue jsValue = toJS(exec, value);
+    return jsValue.isBoolean();

 }
 
 }
 

-bool JSValueIsNumber(JSContextRef, JSValueRef value)
+bool JSValueIsNumber(JSContextRef ctx, JSValueRef value)

 {
 {

-    JSValue* jsValue = toJS(value);
-    return jsValue->isNumber();
+    ExecState* exec = toJS(ctx);
+    APIEntryShim entryShim(exec);
+
+    JSValue jsValue = toJS(exec, value);
+    return jsValue.isNumber();

 }
 
 }
 

-bool JSValueIsString(JSContextRef, JSValueRef value)
+bool JSValueIsString(JSContextRef ctx, JSValueRef value)

 {
 {

-    JSValue* jsValue = toJS(value);
-    return jsValue->isString();
+    ExecState* exec = toJS(ctx);
+    APIEntryShim entryShim(exec);
+
+    JSValue jsValue = toJS(exec, value);
+    return jsValue.isString();

 }
 
 }
 

-bool JSValueIsObject(JSContextRef, JSValueRef value)
+bool JSValueIsObject(JSContextRef ctx, JSValueRef value)

 {
 {

-    JSValue* jsValue = toJS(value);
-    return jsValue->isObject();
+    ExecState* exec = toJS(ctx);
+    APIEntryShim entryShim(exec);
+
+    JSValue jsValue = toJS(exec, value);
+    return jsValue.isObject();

 }
 
 }
 

-bool JSValueIsObjectOfClass(JSContextRef, JSValueRef value, JSClassRef jsClass)
+bool JSValueIsObjectOfClass(JSContextRef ctx, JSValueRef value, JSClassRef jsClass)

 {
 {

-    JSValue* jsValue = toJS(value);
+    ExecState* exec = toJS(ctx);
+    APIEntryShim entryShim(exec);
+
+    JSValue jsValue = toJS(exec, value);

     
     

-    if (JSObject* o = jsValue->getObject()) {
+    if (JSObject* o = jsValue.getObject()) {

         if (o->inherits(&JSCallbackObject<JSGlobalObject>::info))
             return static_cast<JSCallbackObject<JSGlobalObject>*>(o)->inherits(jsClass);
         else if (o->inherits(&JSCallbackObject<JSObject>::info))
         if (o->inherits(&JSCallbackObject<JSGlobalObject>::info))
             return static_cast<JSCallbackObject<JSGlobalObject>*>(o)->inherits(jsClass);
         else if (o->inherits(&JSCallbackObject<JSObject>::info))


@@ -118,15 +137,16 @@ bool JSValueIsObjectOfClass(JSContextRef, JSValueRef value, JSClassRef jsClass)
 
 bool JSValueIsEqual(JSContextRef ctx, JSValueRef a, JSValueRef b, JSValueRef* exception)
 {
 
 bool JSValueIsEqual(JSContextRef ctx, JSValueRef a, JSValueRef b, JSValueRef* exception)
 {

-    JSLock lock;

     ExecState* exec = toJS(ctx);
     ExecState* exec = toJS(ctx);

-    JSValue* jsA = toJS(a);
-    JSValue* jsB = toJS(b);
+    APIEntryShim entryShim(exec);
+
+    JSValue jsA = toJS(exec, a);
+    JSValue jsB = toJS(exec, b);

 
 

-    bool result = equal(exec, jsA, jsB); // false if an exception is thrown
+    bool result = JSValue::equal(exec, jsA, jsB); // false if an exception is thrown

     if (exec->hadException()) {
         if (exception)
     if (exec->hadException()) {
         if (exception)

-            *exception = toRef(exec->exception());
+            *exception = toRef(exec, exec->exception());

         exec->clearException();
     }
     return result;
         exec->clearException();
     }
     return result;


@@ -134,78 +154,94 @@ bool JSValueIsEqual(JSContextRef ctx, JSValueRef a, JSValueRef b, JSValueRef* ex
 
 bool JSValueIsStrictEqual(JSContextRef ctx, JSValueRef a, JSValueRef b)
 {
 
 bool JSValueIsStrictEqual(JSContextRef ctx, JSValueRef a, JSValueRef b)
 {

-    JSLock lock;

     ExecState* exec = toJS(ctx);
     ExecState* exec = toJS(ctx);

-    JSValue* jsA = toJS(a);
-    JSValue* jsB = toJS(b);
-    
-    bool result = strictEqual(exec, jsA, jsB); // can't throw because it doesn't perform value conversion
-    ASSERT(!exec->hadException());
-    return result;
+    APIEntryShim entryShim(exec);
+
+    JSValue jsA = toJS(exec, a);
+    JSValue jsB = toJS(exec, b);
+
+    return JSValue::strictEqual(exec, jsA, jsB);

 }
 
 bool JSValueIsInstanceOfConstructor(JSContextRef ctx, JSValueRef value, JSObjectRef constructor, JSValueRef* exception)
 {
 }
 
 bool JSValueIsInstanceOfConstructor(JSContextRef ctx, JSValueRef value, JSObjectRef constructor, JSValueRef* exception)
 {

-    JSLock lock;

     ExecState* exec = toJS(ctx);
     ExecState* exec = toJS(ctx);

-    JSValue* jsValue = toJS(value);
+    APIEntryShim entryShim(exec);
+
+    JSValue jsValue = toJS(exec, value);
+

     JSObject* jsConstructor = toJS(constructor);
     JSObject* jsConstructor = toJS(constructor);

-    if (!jsConstructor->implementsHasInstance())
+    if (!jsConstructor->structure()->typeInfo().implementsHasInstance())

         return false;
         return false;

-    bool result = jsConstructor->hasInstance(exec, jsValue); // false if an exception is thrown
+    bool result = jsConstructor->hasInstance(exec, jsValue, jsConstructor->get(exec, exec->propertyNames().prototype)); // false if an exception is thrown

     if (exec->hadException()) {
         if (exception)
     if (exec->hadException()) {
         if (exception)

-            *exception = toRef(exec->exception());
+            *exception = toRef(exec, exec->exception());

         exec->clearException();
     }
     return result;
 }
 
         exec->clearException();
     }
     return result;
 }
 

-JSValueRef JSValueMakeUndefined(JSContextRef)
+JSValueRef JSValueMakeUndefined(JSContextRef ctx)

 {
 {

-    return toRef(jsUndefined());
+    ExecState* exec = toJS(ctx);
+    APIEntryShim entryShim(exec);
+
+    return toRef(exec, jsUndefined());

 }
 
 }
 

-JSValueRef JSValueMakeNull(JSContextRef)
+JSValueRef JSValueMakeNull(JSContextRef ctx)

 {
 {

-    return toRef(jsNull());
+    ExecState* exec = toJS(ctx);
+    APIEntryShim entryShim(exec);
+
+    return toRef(exec, jsNull());

 }
 
 }
 

-JSValueRef JSValueMakeBoolean(JSContextRef, bool value)
+JSValueRef JSValueMakeBoolean(JSContextRef ctx, bool value)

 {
 {

-    return toRef(jsBoolean(value));
+    ExecState* exec = toJS(ctx);
+    APIEntryShim entryShim(exec);
+
+    return toRef(exec, jsBoolean(value));

 }
 
 }
 

-JSValueRef JSValueMakeNumber(JSContextRef, double value)
+JSValueRef JSValueMakeNumber(JSContextRef ctx, double value)

 {
 {

-    JSLock lock;
-    return toRef(jsNumber(value));
+    ExecState* exec = toJS(ctx);
+    APIEntryShim entryShim(exec);
+
+    return toRef(exec, jsNumber(exec, value));

 }
 
 }
 

-JSValueRef JSValueMakeString(JSContextRef, JSStringRef string)
+JSValueRef JSValueMakeString(JSContextRef ctx, JSStringRef string)

 {
 {

-    JSLock lock;
-    UString::Rep* rep = toJS(string);
-    return toRef(jsString(UString(rep)));
+    ExecState* exec = toJS(ctx);
+    APIEntryShim entryShim(exec);
+
+    return toRef(exec, jsString(exec, string->ustring()));

 }
 
 bool JSValueToBoolean(JSContextRef ctx, JSValueRef value)
 {
     ExecState* exec = toJS(ctx);
 }
 
 bool JSValueToBoolean(JSContextRef ctx, JSValueRef value)
 {
     ExecState* exec = toJS(ctx);

-    JSValue* jsValue = toJS(value);
-    return jsValue->toBoolean(exec);
+    APIEntryShim entryShim(exec);
+
+    JSValue jsValue = toJS(exec, value);
+    return jsValue.toBoolean(exec);

 }
 
 double JSValueToNumber(JSContextRef ctx, JSValueRef value, JSValueRef* exception)
 {
 }
 
 double JSValueToNumber(JSContextRef ctx, JSValueRef value, JSValueRef* exception)
 {

-    JSLock lock;
-    JSValue* jsValue = toJS(value);

     ExecState* exec = toJS(ctx);
     ExecState* exec = toJS(ctx);

+    APIEntryShim entryShim(exec);
+
+    JSValue jsValue = toJS(exec, value);

 
 

-    double number = jsValue->toNumber(exec);
+    double number = jsValue.toNumber(exec);

     if (exec->hadException()) {
         if (exception)
     if (exec->hadException()) {
         if (exception)

-            *exception = toRef(exec->exception());
+            *exception = toRef(exec, exec->exception());

         exec->clearException();
         number = NaN;
     }
         exec->clearException();
         number = NaN;
     }


@@ -214,46 +250,52 @@ double JSValueToNumber(JSContextRef ctx, JSValueRef value, JSValueRef* exception
 
 JSStringRef JSValueToStringCopy(JSContextRef ctx, JSValueRef value, JSValueRef* exception)
 {
 
 JSStringRef JSValueToStringCopy(JSContextRef ctx, JSValueRef value, JSValueRef* exception)
 {

-    JSLock lock;
-    JSValue* jsValue = toJS(value);

     ExecState* exec = toJS(ctx);
     ExecState* exec = toJS(ctx);

+    APIEntryShim entryShim(exec);
+
+    JSValue jsValue = toJS(exec, value);

     
     

-    JSStringRef stringRef = toRef(jsValue->toString(exec).rep()->ref());
+    RefPtr<OpaqueJSString> stringRef(OpaqueJSString::create(jsValue.toString(exec)));

     if (exec->hadException()) {
         if (exception)
     if (exec->hadException()) {
         if (exception)

-            *exception = toRef(exec->exception());
+            *exception = toRef(exec, exec->exception());

         exec->clearException();
         exec->clearException();

-        stringRef = 0;
+        stringRef.clear();

     }
     }

-    return stringRef;
+    return stringRef.release().releaseRef();

 }
 
 JSObjectRef JSValueToObject(JSContextRef ctx, JSValueRef value, JSValueRef* exception)
 {
 }
 
 JSObjectRef JSValueToObject(JSContextRef ctx, JSValueRef value, JSValueRef* exception)
 {

-    JSLock lock;

     ExecState* exec = toJS(ctx);
     ExecState* exec = toJS(ctx);

-    JSValue* jsValue = toJS(value);
+    APIEntryShim entryShim(exec);
+
+    JSValue jsValue = toJS(exec, value);

     
     

-    JSObjectRef objectRef = toRef(jsValue->toObject(exec));
+    JSObjectRef objectRef = toRef(jsValue.toObject(exec));

     if (exec->hadException()) {
         if (exception)
     if (exec->hadException()) {
         if (exception)

-            *exception = toRef(exec->exception());
+            *exception = toRef(exec, exec->exception());

         exec->clearException();
         objectRef = 0;
     }
     return objectRef;
 }    
 
         exec->clearException();
         objectRef = 0;
     }
     return objectRef;
 }    
 

-void JSValueProtect(JSContextRef, JSValueRef value)
+void JSValueProtect(JSContextRef ctx, JSValueRef value)

 {
 {

-    JSLock lock;
-    JSValue* jsValue = toJS(value);
+    ExecState* exec = toJS(ctx);
+    APIEntryShim entryShim(exec);
+
+    JSValue jsValue = toJSForGC(exec, value);

     gcProtect(jsValue);
 }
 
     gcProtect(jsValue);
 }
 

-void JSValueUnprotect(JSContextRef, JSValueRef value)
+void JSValueUnprotect(JSContextRef ctx, JSValueRef value)

 {
 {

-    JSLock lock;
-    JSValue* jsValue = toJS(value);
+    ExecState* exec = toJS(ctx);
+    APIEntryShim entryShim(exec);
+
+    JSValue jsValue = toJSForGC(exec, value);

     gcUnprotect(jsValue);
 }
     gcUnprotect(jsValue);
 }