Changeset 15225 in webkit for trunk/JavaScriptCore

Timestamp:

Jul 7, 2006, 7:25:55 PM (19 years ago)

Author:

ggaren

Message:

Reviewed by Maciej.

• Standardized which functions take a JSContext as an argument. The rule is: if you might execute JavaScript, you take a JSContext, otherwise you don't.

The FIXME in JSObjectRef.h requires refactoring some parts of Interpreter,
but not API changes, so I'm putting it off until later.

• API/JSCallbackObject.cpp: (KJS::JSCallbackObject::JSCallbackObject): (KJS::JSCallbackObject::init):
• API/JSCallbackObject.h:
• API/JSContextRef.cpp: (JSContextCreate):
• API/JSContextRef.h:
• API/JSObjectRef.cpp: (JSObjectMake): (JSPropertyEnumeratorGetNext):
• API/JSObjectRef.h:
• API/testapi.c: (MyObject_initialize): (main):
• JavaScriptCore.exp:
• kjs/array_object.cpp: (ArrayInstance::setLength): (ArrayInstance::pushUndefinedObjectsToEnd):
• kjs/nodes.cpp: (ForInNode::execute):
• kjs/reference.cpp: (KJS::Reference::getPropertyName): (KJS::Reference::getValue):
• kjs/reference.h:
• kjs/scope_chain.cpp: (KJS::ScopeChain::print):

Location:

trunk/JavaScriptCore

Files:

• API/JSCallbackObject.cpp (modified) (2 diffs)
• API/JSCallbackObject.h (modified) (2 diffs)
• API/JSContextRef.cpp (modified) (1 diff)
• API/JSContextRef.h (modified) (1 diff)
• API/JSObjectRef.cpp (modified) (2 diffs)
• API/JSObjectRef.h (modified) (2 diffs)
• API/testapi.c (modified) (2 diffs)
• ChangeLog (modified) (1 diff)
• JavaScriptCore.exp (modified) (1 diff)
• kjs/array_object.cpp (modified) (2 diffs)
• kjs/nodes.cpp (modified) (1 diff)
• kjs/reference.cpp (modified) (2 diffs)
• kjs/reference.h (modified) (1 diff)
• kjs/scope_chain.cpp (modified) (1 diff)

trunk/JavaScriptCore/API/JSCallbackObject.cpp

@@ -38 +38 @@
 const ClassInfo JSCallbackObject::info = { "CallbackObject", 0, 0, 0 };
 
-JSCallbackObject::JSCallbackObject(JSClassRef jsClass)
+JSCallbackObject::JSCallbackObject(JSContextRef context, JSClassRef jsClass)
     : JSObject()
 {
-    init(jsClass);
-}
-
-JSCallbackObject::JSCallbackObject(JSClassRef jsClass, JSObject* prototype)
+    init(context, jsClass);
+}
+
+JSCallbackObject::JSCallbackObject(JSContextRef context, JSClassRef jsClass, JSObject* prototype)
     : JSObject(prototype)
 {
-    init(jsClass);
-}
-
-void JSCallbackObject::init(JSClassRef jsClass)
+    init(context, jsClass);
+}
+
+void JSCallbackObject::init(JSContextRef context, JSClassRef jsClass)
 {
     m_privateData = 0;
@@ -59 +59 @@
     do {
         if (JSInitializeCallback initialize = jsClass->callbacks.initialize)
-            initialize(thisRef);
+            initialize(context, thisRef);
     } while ((jsClass = jsClass->parent));
 }

trunk/JavaScriptCore/API/JSCallbackObject.h

@@ -37 +37 @@
 {
 public:
-    JSCallbackObject(JSClassRef globalObjectClass);
-    JSCallbackObject(JSClassRef globalObjectClass, JSObject* prototype);
+    JSCallbackObject(JSContextRef, JSClassRef);
+    JSCallbackObject(JSContextRef, JSClassRef, JSObject* prototype);
     virtual ~JSCallbackObject();
         
@@ -76 +76 @@
     JSCallbackObject(const JSCallbackObject&);
 
-    void init(JSClassRef jsClass);
+    void init(JSContextRef, JSClassRef);
     
     static JSValue* cachedValueGetter(ExecState*, JSObject*, const Identifier&, const PropertySlot&);

trunk/JavaScriptCore/API/JSContextRef.cpp

@@ -41 +41 @@
     JSObject* globalObject;
     if (globalObjectClass)
-        globalObject = new JSCallbackObject(globalObjectClass);
+        // FIXME: We need to pass a real ExecState here to support an initialize callback in globalObjectClass
+        globalObject = new JSCallbackObject(0, globalObjectClass);
     else
         globalObject = new JSObject();

trunk/JavaScriptCore/API/JSContextRef.h

@@ -111 +111 @@
 }
 #endif
-        
+
 #endif // JSContextRef_h

trunk/JavaScriptCore/API/JSObjectRef.cpp

@@ -54 +54 @@
         return toRef(new JSObject(jsPrototype)); // slightly more efficient
     else
-        return toRef(new JSCallbackObject(jsClass, jsPrototype));
+        return toRef(new JSCallbackObject(context, jsClass, jsPrototype));
 }
 
@@ -282 +282 @@
 }
 
-JSStringBufferRef JSPropertyEnumeratorGetNext(JSContextRef context, JSPropertyEnumeratorRef enumerator)
-{
-    ExecState* exec = toJS(context);
+JSStringBufferRef JSPropertyEnumeratorGetNext(JSPropertyEnumeratorRef enumerator)
+{
     ReferenceListIterator& iterator = enumerator->iterator;
     if (iterator != enumerator->list.end()) {
-        JSStringBufferRef result = toRef(iterator->getPropertyName(exec).ustring().rep());
+        JSStringBufferRef result = toRef(iterator->getPropertyName().ustring().rep());
         iterator++;
         return result;

trunk/JavaScriptCore/API/JSObjectRef.h

@@ -58 +58 @@
 @typedef JSInitializeCallback
 @abstract The callback invoked when an object is first created.
+@param context The execution context to use.
 @param object The JSObject being created.
 @discussion If you named your function Initialize, you would declare it like this:
 
-void Initialize(JSObjectRef object);
-*/
-
-// FIXME: Needs to take a context argument, but can't because no context exists when we're creating the global object
+void Initialize(JSContextRef context, JSObjectRef object);
+*/
 typedef void
-(*JSInitializeCallback)         (JSObjectRef object);
+(*JSInitializeCallback)         (JSContextRef context, JSObjectRef object);
 
 /*! 
@@ -493 +492 @@
 @function
 @abstract Gets a property enumerator's next property.
-@param context The execution context to use.
 @param enumerator The JSPropertyEnumerator whose next property you want to get.
 @result A JSStringBuffer containing the property's name, or NULL if all properties have been enumerated.
 */
-JSStringBufferRef JSPropertyEnumeratorGetNext(JSContextRef context, JSPropertyEnumeratorRef enumerator);
+JSStringBufferRef JSPropertyEnumeratorGetNext(JSPropertyEnumeratorRef enumerator);
 
 /*!

trunk/JavaScriptCore/API/testapi.c

@@ -123 +123 @@
 
 static bool didInitialize = false;
-static void MyObject_initialize(JSObjectRef object)
+static void MyObject_initialize(JSContextRef context, JSObjectRef object)
 {
     UNUSED_PARAM(context);
@@ -594 +594 @@
     JSPropertyEnumeratorRef enumerator = JSObjectCreatePropertyEnumerator(context, o);
     int count = 0;
-    while (JSPropertyEnumeratorGetNext(context, enumerator))
+    while (JSPropertyEnumeratorGetNext(enumerator))
         ++count;
     JSPropertyEnumeratorRelease(enumerator);

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2006-07-07  Geoffrey Garen  <[email protected]>
+
+        Reviewed by Maciej.
+        
+        - Standardized which functions take a JSContext as an argument. The rule is:
+        if you might execute JavaScript, you take a JSContext, otherwise you don't.
+        
+        The FIXME in JSObjectRef.h requires refactoring some parts of Interpreter,
+        but not API changes, so I'm putting it off until later.
+
+        * API/JSCallbackObject.cpp:
+        (KJS::JSCallbackObject::JSCallbackObject):
+        (KJS::JSCallbackObject::init):
+        * API/JSCallbackObject.h:
+        * API/JSContextRef.cpp:
+        (JSContextCreate):
+        * API/JSContextRef.h:
+        * API/JSObjectRef.cpp:
+        (JSObjectMake):
+        (JSPropertyEnumeratorGetNext):
+        * API/JSObjectRef.h:
+        * API/testapi.c:
+        (MyObject_initialize):
+        (main):
+        * JavaScriptCore.exp:
+        * kjs/array_object.cpp:
+        (ArrayInstance::setLength):
+        (ArrayInstance::pushUndefinedObjectsToEnd):
+        * kjs/nodes.cpp:
+        (ForInNode::execute):
+        * kjs/reference.cpp:
+        (KJS::Reference::getPropertyName):
+        (KJS::Reference::getValue):
+        * kjs/reference.h:
+        * kjs/scope_chain.cpp:
+        (KJS::ScopeChain::print):
+
 2006-07-06  Geoffrey Garen  <[email protected]>
 

trunk/JavaScriptCore/JavaScriptCore.exp

@@ -262 +262 @@
 __ZNK3KJS8JSObject9toBooleanEPNS_9ExecStateE
 __ZNK3KJS9ExecState18lexicalInterpreterEv
-__ZNK3KJS9Reference15getPropertyNameEPNS_9ExecStateE
+__ZNK3KJS9Reference15getPropertyNameEv
 __ZTVN3KJS19InternalFunctionImpE
 __ZTVN3KJS8JSObjectE

trunk/JavaScriptCore/kjs/array_object.cpp

@@ -252 +252 @@
       Reference ref = it++;
       bool ok;
-      unsigned index = ref.getPropertyName(exec).toArrayIndex(&ok);
+      unsigned index = ref.getPropertyName().toArrayIndex(&ok);
       if (ok && index > newLength) {
         ref.deleteValue(exec);
@@ -374 +374 @@
       Reference ref = it++;
       storage[o] = ref.getValue(exec);
-      JSObject::deleteProperty(exec, ref.getPropertyName(exec));
+      JSObject::deleteProperty(exec, ref.getPropertyName());
       o++;
     }

trunk/JavaScriptCore/kjs/nodes.cpp

@@ -1884 +1884 @@
 
   while (propIt != propertyList.end()) {
-    Identifier name = propIt->getPropertyName(exec);
+    Identifier name = propIt->getPropertyName();
     if (!v->hasProperty(exec, name)) {
       propIt++;

trunk/JavaScriptCore/kjs/reference.cpp

@@ -44 +44 @@
 }
 
-Identifier Reference::getPropertyName(ExecState*) const
+Identifier Reference::getPropertyName() const
 {
   if (propertyNameIsNumber && prop.isNull())
@@ -56 +56 @@
   if (!o || !o->isObject()) {
     if (!o || o->isNull())
-      return throwError(exec, ReferenceError, "Can't find variable: " + getPropertyName(exec).ustring());
+      return throwError(exec, ReferenceError, "Can't find variable: " + getPropertyName().ustring());
     return throwError(exec, ReferenceError, "Base is not an object");
   }

trunk/JavaScriptCore/kjs/reference.h

@@ -41 +41 @@
      * (ECMA 8.7)
      */
-    Identifier getPropertyName(ExecState *exec) const;
+    Identifier getPropertyName() const;
 
     /**

trunk/JavaScriptCore/kjs/scope_chain.cpp

@@ -49 +49 @@
         fprintf(stderr, "----- [scope %p] -----\n", o);
         for (ReferenceListIterator propIter = propertyList.begin(); propIter != propEnd; propIter++) {
-            Identifier name = propIter->getPropertyName(exec);
+            Identifier name = propIter->getPropertyName();
             fprintf(stderr, "%s, ", name.ascii());
         }