RS by Maciej.

        Global replace in the API of argc/argv with argumentCount/arguments.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@15444 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/API/JSCallbackConstructor.cpp b/JavaScriptCore/API/JSCallbackConstructor.cpp
index dfdb29567daf302667fbdb36ea9b60e38a9b8d50..7bd29534d49b507ae3d5fb5023640ae1b44f3051 100644 (file)
--- a/JavaScriptCore/API/JSCallbackConstructor.cpp
+++ b/JavaScriptCore/API/JSCallbackConstructor.cpp
@@ -47,11 +47,11 @@ JSObject* JSCallbackConstructor::construct(ExecState* exec, const List &args)
     JSContextRef execRef = toRef(exec);
     JSObjectRef thisRef = toRef(this);
 
-    size_t argc = args.size();
-    JSValueRef argv[argc];
-    for (size_t i = 0; i < argc; i++)
-        argv[i] = toRef(args[i]);
-    return toJS(m_callback(execRef, thisRef, argc, argv, toRef(exec->exceptionSlot())));
+    size_t argumentCount = args.size();
+    JSValueRef arguments[argumentCount];
+    for (size_t i = 0; i < argumentCount; i++)
+        arguments[i] = toRef(args[i]);
+    return toJS(m_callback(execRef, thisRef, argumentCount, arguments, toRef(exec->exceptionSlot())));
 }
 
 void JSCallbackConstructor::setPrivate(void* data)

diff --git a/JavaScriptCore/API/JSCallbackFunction.cpp b/JavaScriptCore/API/JSCallbackFunction.cpp
index 5cc26205e10924932a6d30a1277ff4e3100ed51a..c26ef87777cc13adb93ca052c5291a1a8536998b 100644 (file)
--- a/JavaScriptCore/API/JSCallbackFunction.cpp
+++ b/JavaScriptCore/API/JSCallbackFunction.cpp
@@ -50,11 +50,11 @@ JSValue* JSCallbackFunction::callAsFunction(ExecState* exec, JSObject* thisObj,
     JSObjectRef thisRef = toRef(this);
     JSObjectRef thisObjRef = toRef(thisObj);
 
-    size_t argc = args.size();
-    JSValueRef argv[argc];
-    for (size_t i = 0; i < argc; i++)
-        argv[i] = toRef(args[i]);
-    return toJS(m_callback(execRef, thisRef, thisObjRef, argc, argv, toRef(exec->exceptionSlot())));
+    size_t argumentCount = args.size();
+    JSValueRef arguments[argumentCount];
+    for (size_t i = 0; i < argumentCount; i++)
+        arguments[i] = toRef(args[i]);
+    return toJS(m_callback(execRef, thisRef, thisObjRef, argumentCount, arguments, toRef(exec->exceptionSlot())));
 }
 
 void JSCallbackFunction::setPrivate(void* data)

diff --git a/JavaScriptCore/API/JSCallbackObject.cpp b/JavaScriptCore/API/JSCallbackObject.cpp
index befdc7065482eaa0ad8baa7a7365c62cfa0feaa5..e7ea734109b894f6746023a0c166f14afc68467f 100644 (file)
--- a/JavaScriptCore/API/JSCallbackObject.cpp
+++ b/JavaScriptCore/API/JSCallbackObject.cpp
@@ -223,11 +223,11 @@ JSObject* JSCallbackObject::construct(ExecState* exec, const List& args)
     
     for (JSClassRef jsClass = m_class; jsClass; jsClass = jsClass->parent) {
         if (JSObjectCallAsConstructorCallback callAsConstructor = jsClass->callbacks.callAsConstructor) {
-            size_t argc = args.size();
-            JSValueRef argv[argc];
-            for (size_t i = 0; i < argc; i++)
-                argv[i] = toRef(args[i]);
-            return toJS(callAsConstructor(execRef, thisRef, argc, argv, toRef(exec->exceptionSlot())));
+            size_t argumentCount = args.size();
+            JSValueRef arguments[argumentCount];
+            for (size_t i = 0; i < argumentCount; i++)
+                arguments[i] = toRef(args[i]);
+            return toJS(callAsConstructor(execRef, thisRef, argumentCount, arguments, toRef(exec->exceptionSlot())));
         }
     }
     
@@ -275,11 +275,11 @@ JSValue* JSCallbackObject::callAsFunction(ExecState* exec, JSObject* thisObj, co
 
     for (JSClassRef jsClass = m_class; jsClass; jsClass = jsClass->parent) {
         if (JSObjectCallAsFunctionCallback callAsFunction = jsClass->callbacks.callAsFunction) {
-            size_t argc = args.size();
-            JSValueRef argv[argc];
-            for (size_t i = 0; i < argc; i++)
-                argv[i] = toRef(args[i]);
-            return toJS(callAsFunction(execRef, thisRef, thisObjRef, argc, argv, toRef(exec->exceptionSlot())));
+            size_t argumentCount = args.size();
+            JSValueRef arguments[argumentCount];
+            for (size_t i = 0; i < argumentCount; i++)
+                arguments[i] = toRef(args[i]);
+            return toJS(callAsFunction(execRef, thisRef, thisObjRef, argumentCount, arguments, toRef(exec->exceptionSlot())));
         }
     }
 

diff --git a/JavaScriptCore/API/JSNode.c b/JavaScriptCore/API/JSNode.c
index 1c9c1defb58f9d88e62cbc9e1ebbcd45b90d504c..35bb56455e1b4b3c7e23d99455c65fc31f6340aa 100644 (file)
--- a/JavaScriptCore/API/JSNode.c
+++ b/JavaScriptCore/API/JSNode.c
@@ -32,7 +32,7 @@
 
 static JSClassRef JSNode_class(JSContextRef context);
 
-static JSValueRef JSNodePrototype_appendChild(JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argc, JSValueRef argv[], JSValueRef* exception)
+static JSValueRef JSNodePrototype_appendChild(JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, JSValueRef arguments[], JSValueRef* exception)
 {
     UNUSED_PARAM(context);
     UNUSED_PARAM(function);
@@ -42,13 +42,13 @@ static JSValueRef JSNodePrototype_appendChild(JSContextRef context, JSObjectRef
         JSStringRef message = JSStringCreateWithUTF8CString("TypeError: appendChild can only be called on nodes");
         *exception = JSValueMakeString(message);
         JSStringRelease(message);
-    } else if (argc < 1 || !JSValueIsObjectOfClass(argv[0], JSNode_class(context))) {
+    } else if (argumentCount < 1 || !JSValueIsObjectOfClass(arguments[0], JSNode_class(context))) {
         JSStringRef message = JSStringCreateWithUTF8CString("TypeError: first argument to appendChild must be a node");
         *exception = JSValueMakeString(message);
         JSStringRelease(message);
     } else {
         Node* node = JSObjectGetPrivate(thisObject);
-        Node* child = JSObjectGetPrivate(JSValueToObject(context, argv[0], NULL));
+        Node* child = JSObjectGetPrivate(JSValueToObject(context, arguments[0], NULL));
 
         Node_appendChild(node, child);
     }
@@ -56,17 +56,17 @@ static JSValueRef JSNodePrototype_appendChild(JSContextRef context, JSObjectRef
     return JSValueMakeUndefined();
 }
 
-static JSValueRef JSNodePrototype_removeChild(JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argc, JSValueRef argv[], JSValueRef* exception)
+static JSValueRef JSNodePrototype_removeChild(JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, JSValueRef arguments[], JSValueRef* exception)
 {
     UNUSED_PARAM(context);
     UNUSED_PARAM(function);
     
     // Example of ignoring invalid values
-    if (argc > 0) {
+    if (argumentCount > 0) {
         if (JSValueIsObjectOfClass(thisObject, JSNode_class(context))) {
-            if (JSValueIsObjectOfClass(argv[0], JSNode_class(context))) {
+            if (JSValueIsObjectOfClass(arguments[0], JSNode_class(context))) {
                 Node* node = JSObjectGetPrivate(thisObject);
-                Node* child = JSObjectGetPrivate(JSValueToObject(context, argv[0], NULL));
+                Node* child = JSObjectGetPrivate(JSValueToObject(context, arguments[0], NULL));
                 
                 Node_removeChild(node, child);
             }
@@ -76,18 +76,18 @@ static JSValueRef JSNodePrototype_removeChild(JSContextRef context, JSObjectRef
     return JSValueMakeUndefined();
 }
 
-static JSValueRef JSNodePrototype_replaceChild(JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argc, JSValueRef argv[], JSValueRef* exception)
+static JSValueRef JSNodePrototype_replaceChild(JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, JSValueRef arguments[], JSValueRef* exception)
 {
     UNUSED_PARAM(context);
     UNUSED_PARAM(function);
     
-    if (argc > 1) {
+    if (argumentCount > 1) {
         if (JSValueIsObjectOfClass(thisObject, JSNode_class(context))) {
-            if (JSValueIsObjectOfClass(argv[0], JSNode_class(context))) {
-                if (JSValueIsObjectOfClass(argv[1], JSNode_class(context))) {
+            if (JSValueIsObjectOfClass(arguments[0], JSNode_class(context))) {
+                if (JSValueIsObjectOfClass(arguments[1], JSNode_class(context))) {
                     Node* node = JSObjectGetPrivate(thisObject);
-                    Node* newChild = JSObjectGetPrivate(JSValueToObject(context, argv[0], NULL));
-                    Node* oldChild = JSObjectGetPrivate(JSValueToObject(context, argv[1], NULL));
+                    Node* newChild = JSObjectGetPrivate(JSValueToObject(context, arguments[0], NULL));
+                    Node* oldChild = JSObjectGetPrivate(JSValueToObject(context, arguments[1], NULL));
                     
                     Node_replaceChild(node, newChild, oldChild);
                 }
@@ -192,11 +192,11 @@ JSObjectRef JSNode_new(JSContextRef context, Node* node)
     return jsNode;
 }
 
-JSObjectRef JSNode_construct(JSContextRef context, JSObjectRef object, size_t argc, JSValueRef argv[], JSValueRef* exception)
+JSObjectRef JSNode_construct(JSContextRef context, JSObjectRef object, size_t argumentCount, JSValueRef arguments[], JSValueRef* exception)
 {
     UNUSED_PARAM(object);
-    UNUSED_PARAM(argc);
-    UNUSED_PARAM(argv);
+    UNUSED_PARAM(argumentCount);
+    UNUSED_PARAM(arguments);
 
     return JSNode_new(context, Node_new());
 }

diff --git a/JavaScriptCore/API/JSNode.h b/JavaScriptCore/API/JSNode.h
index 437564cb07ec6d8e2aa4f4f8a45717830f75a704..ad427bd2dcee035e2fc31fcbe0c10065871dea97 100644 (file)
--- a/JavaScriptCore/API/JSNode.h
+++ b/JavaScriptCore/API/JSNode.h
@@ -31,6 +31,6 @@
 #include "Node.h"
 
 extern JSObjectRef JSNode_new(JSContextRef context, Node* node);
-extern JSObjectRef JSNode_construct(JSContextRef context, JSObjectRef object, size_t argc, JSValueRef argv[], JSValueRef* exception);
+extern JSObjectRef JSNode_construct(JSContextRef context, JSObjectRef object, size_t argumentCount, JSValueRef arguments[], JSValueRef* exception);
 
 #endif // JSNode_h

diff --git a/JavaScriptCore/API/JSNodeList.c b/JavaScriptCore/API/JSNodeList.c
index d13758a5f6219e6cfe460ae45fa7939a003bceb5..63a740aa374bfbe1c7d53b7bb0c547a52f9ff7ee 100644 (file)
--- a/JavaScriptCore/API/JSNodeList.c
+++ b/JavaScriptCore/API/JSNodeList.c
@@ -28,12 +28,12 @@
 #include "JSNodeList.h"
 #include "UnusedParam.h"
 
-static JSValueRef JSNodeListPrototype_item(JSContextRef context, JSObjectRef object, JSObjectRef thisObject, size_t argc, JSValueRef argv[], JSValueRef* exception)
+static JSValueRef JSNodeListPrototype_item(JSContextRef context, JSObjectRef object, JSObjectRef thisObject, size_t argumentCount, JSValueRef arguments[], JSValueRef* exception)
 {
-    if (argc > 0) {
+    if (argumentCount > 0) {
         NodeList* nodeList = JSObjectGetPrivate(thisObject);
         assert(nodeList);
-        Node* node = NodeList_item(nodeList, JSValueToNumber(context, argv[0], exception));
+        Node* node = NodeList_item(nodeList, JSValueToNumber(context, arguments[0], exception));
         if (node)
             return JSNode_new(context, node);
     }

diff --git a/JavaScriptCore/API/JSObjectRef.cpp b/JavaScriptCore/API/JSObjectRef.cpp
index f3e4143b27c828f5a804aec9784bbe341e0f6d51..6cd63c6a59c131b3f37bc42b23de431c0b8ec942 100644 (file)
--- a/JavaScriptCore/API/JSObjectRef.cpp
+++ b/JavaScriptCore/API/JSObjectRef.cpp
@@ -237,7 +237,7 @@ bool JSObjectIsFunction(JSObjectRef object)
     return jsObject->implementsCall();
 }
 
-JSValueRef JSObjectCallAsFunction(JSContextRef context, JSObjectRef object, JSObjectRef thisObject, size_t argc, JSValueRef argv[], JSValueRef* exception)
+JSValueRef JSObjectCallAsFunction(JSContextRef context, JSObjectRef object, JSObjectRef thisObject, size_t argumentCount, JSValueRef arguments[], JSValueRef* exception)
 {
     JSLock lock;
     ExecState* exec = toJS(context);
@@ -248,8 +248,8 @@ JSValueRef JSObjectCallAsFunction(JSContextRef context, JSObjectRef object, JSOb
         jsThisObject = exec->dynamicInterpreter()->globalObject();
     
     List argList;
-    for (size_t i = 0; i < argc; i++)
-        argList.append(toJS(argv[i]));
+    for (size_t i = 0; i < argumentCount; i++)
+        argList.append(toJS(arguments[i]));
 
     JSValueRef result = toRef(jsObject->call(exec, jsThisObject, argList)); // returns NULL if object->implementsCall() is false
     if (exec->hadException()) {
@@ -267,15 +267,15 @@ bool JSObjectIsConstructor(JSObjectRef object)
     return jsObject->implementsConstruct();
 }
 
-JSObjectRef JSObjectCallAsConstructor(JSContextRef context, JSObjectRef object, size_t argc, JSValueRef argv[], JSValueRef* exception)
+JSObjectRef JSObjectCallAsConstructor(JSContextRef context, JSObjectRef object, size_t argumentCount, JSValueRef arguments[], JSValueRef* exception)
 {
     JSLock lock;
     ExecState* exec = toJS(context);
     JSObject* jsObject = toJS(object);
     
     List argList;
-    for (size_t i = 0; i < argc; i++)
-        argList.append(toJS(argv[i]));
+    for (size_t i = 0; i < argumentCount; i++)
+        argList.append(toJS(arguments[i]));
     
     JSObjectRef result = toRef(jsObject->construct(exec, argList)); // returns NULL if object->implementsCall() is false
     if (exec->hadException()) {

diff --git a/JavaScriptCore/API/JSObjectRef.h b/JavaScriptCore/API/JSObjectRef.h
index d5ca38f055a52ed947a60a3600da87a7be1b43f3..f2bfe81bfbb79b71575f011a21a5643eb61529f4 100644 (file)
--- a/JavaScriptCore/API/JSObjectRef.h
+++ b/JavaScriptCore/API/JSObjectRef.h
@@ -175,40 +175,40 @@ typedef void
 @param context The current execution context.
 @param function A JSObject that is the function being called.
 @param thisObject A JSObject that is the 'this' variable in the function's scope.
-@param argc An integer count of the number of arguments in argv.
-@param argv A JSValue array of the  arguments passed to the function.
+@param argumentCount An integer count of the number of arguments in arguments.
+@param arguments A JSValue array of the  arguments passed to the function.
 @param exception A pointer to a JSValueRef in which to return an exception, if any.
 @result A JSValue that is the function's return value.
 @discussion If you named your function CallAsFunction, you would declare it like this:
 
-JSValueRef CallAsFunction(JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argc, JSValueRef argv[], JSValueRef* exception);
+JSValueRef CallAsFunction(JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, JSValueRef arguments[], JSValueRef* exception);
 
 If your callback were invoked by the JavaScript expression 'myObject.myMemberFunction()', function would be set to myMemberFunction, and thisObject would be set to myObject.
 
 If this callback is NULL, calling your object as a function will throw an exception.
 */
 typedef JSValueRef 
-(*JSObjectCallAsFunctionCallback) (JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argc, JSValueRef argv[], JSValueRef* exception);
+(*JSObjectCallAsFunctionCallback) (JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, JSValueRef arguments[], JSValueRef* exception);
 
 /*! 
 @typedef JSObjectCallAsConstructorCallback
 @abstract The callback invoked when an object is used as a constructor in a 'new' expression.
 @param context The current execution context.
 @param constructor A JSObject that is the constructor being called.
-@param argc An integer count of the number of arguments in argv.
-@param argv A JSValue array of the  arguments passed to the function.
+@param argumentCount An integer count of the number of arguments in arguments.
+@param arguments A JSValue array of the  arguments passed to the function.
 @param exception A pointer to a JSValueRef in which to return an exception, if any.
 @result A JSObject that is the constructor's return value.
 @discussion If you named your function CallAsConstructor, you would declare it like this:
 
-JSObjectRef CallAsConstructor(JSContextRef context, JSObjectRef constructor, size_t argc, JSValueRef argv[], JSValueRef* exception);
+JSObjectRef CallAsConstructor(JSContextRef context, JSObjectRef constructor, size_t argumentCount, JSValueRef arguments[], JSValueRef* exception);
 
 If your callback were invoked by the JavaScript expression 'new myConstructorFunction()', constructor would be set to myConstructorFunction.
 
 If this callback is NULL, using your object as a constructor in a 'new' expression will throw an exception.
 */
 typedef JSObjectRef 
-(*JSObjectCallAsConstructorCallback) (JSContextRef context, JSObjectRef constructor, size_t argc, JSValueRef argv[], JSValueRef* exception);
+(*JSObjectCallAsConstructorCallback) (JSContextRef context, JSObjectRef constructor, size_t argumentCount, JSValueRef arguments[], JSValueRef* exception);
 
 /*! 
 @typedef JSObjectHasInstanceCallback
@@ -499,12 +499,12 @@ bool JSObjectIsFunction(JSObjectRef object);
 @param context The execution context to use.
 @param object The JSObject to call as a function.
 @param thisObject The object to use as "this," or NULL to use the global object as "this."
-@param argc An integer count of the number of arguments in argv.
-@param argv A JSValue array of the  arguments to pass to the function.
+@param argumentCount An integer count of the number of arguments in arguments.
+@param arguments A JSValue array of the  arguments to pass to the function.
 @param exception A pointer to a JSValueRef in which to store an exception, if any. Pass NULL if you do not care to store an exception.
 @result The JSValue that results from calling object as a function, or NULL if an exception is thrown or object is not a function.
 */
-JSValueRef JSObjectCallAsFunction(JSContextRef context, JSObjectRef object, JSObjectRef thisObject, size_t argc, JSValueRef argv[], JSValueRef* exception);
+JSValueRef JSObjectCallAsFunction(JSContextRef context, JSObjectRef object, JSObjectRef thisObject, size_t argumentCount, JSValueRef arguments[], JSValueRef* exception);
 /*!
 @function
 @abstract Tests whether an object can be called as a constructor.
@@ -517,12 +517,12 @@ bool JSObjectIsConstructor(JSObjectRef object);
 @abstract Calls an object as a constructor.
 @param context The execution context to use.
 @param object The JSObject to call as a constructor.
-@param argc An integer count of the number of arguments in argv.
-@param argv A JSValue array of the  arguments to pass to the function.
+@param argumentCount An integer count of the number of arguments in arguments.
+@param arguments A JSValue array of the  arguments to pass to the function.
 @param exception A pointer to a JSValueRef in which to store an exception, if any. Pass NULL if you do not care to store an exception.
 @result The JSObject that results from calling object as a constructor, or NULL if an exception is thrown or object is not a constructor.
 */
-JSObjectRef JSObjectCallAsConstructor(JSContextRef context, JSObjectRef object, size_t argc, JSValueRef argv[], JSValueRef* exception);
+JSObjectRef JSObjectCallAsConstructor(JSContextRef context, JSObjectRef object, size_t argumentCount, JSValueRef arguments[], JSValueRef* exception);
 
 /*!
 @function

diff --git a/JavaScriptCore/API/minidom.c b/JavaScriptCore/API/minidom.c
index 3ec1c69e60fd1c37da3dfb3a0ec133a2032aea27..af39144a28952af011b9668f1c332d28cb736e21 100644 (file)
--- a/JavaScriptCore/API/minidom.c
+++ b/JavaScriptCore/API/minidom.c
@@ -29,7 +29,7 @@
 #include <wtf/UnusedParam.h>
 
 static char* createStringWithContentsOfFile(const char* fileName);
-static JSValueRef print(JSContextRef context, JSObjectRef object, JSObjectRef thisObject, size_t argc, JSValueRef argv[], JSValueRef* exception);
+static JSValueRef print(JSContextRef context, JSObjectRef object, JSObjectRef thisObject, size_t argumentCount, JSValueRef arguments[], JSValueRef* exception);
 
 int main(int argc, char* argv[])
 {
@@ -78,10 +78,10 @@ int main(int argc, char* argv[])
     return 0;
 }
 
-static JSValueRef print(JSContextRef context, JSObjectRef object, JSObjectRef thisObject, size_t argc, JSValueRef argv[], JSValueRef* exception)
+static JSValueRef print(JSContextRef context, JSObjectRef object, JSObjectRef thisObject, size_t argumentCount, JSValueRef arguments[], JSValueRef* exception)
 {
-    if (argc > 0) {
-        JSStringRef string = JSValueToStringCopy(context, argv[0], NULL);
+    if (argumentCount > 0) {
+        JSStringRef string = JSValueToStringCopy(context, arguments[0], NULL);
         size_t numChars = JSStringGetMaximumUTF8CStringSize(string);
         char stringUTF8[numChars];
         JSStringGetUTF8CString(string, stringUTF8, numChars);

diff --git a/JavaScriptCore/API/testapi.c b/JavaScriptCore/API/testapi.c
index 16b6d03c1c90b88a5eee99b964bcd1d51269853d..ed655789b7cc7d6f28861d1ff612d2559a24207c 100644 (file)
--- a/JavaScriptCore/API/testapi.c
+++ b/JavaScriptCore/API/testapi.c
@@ -182,24 +182,24 @@ static void MyObject_addPropertiesToList(JSObjectRef object, JSPropertyListRef p
     JSStringRelease(propertyName);
 }
 
-static JSValueRef MyObject_callAsFunction(JSContextRef context, JSObjectRef object, JSObjectRef thisObject, size_t argc, JSValueRef argv[], JSValueRef* exception)
+static JSValueRef MyObject_callAsFunction(JSContextRef context, JSObjectRef object, JSObjectRef thisObject, size_t argumentCount, JSValueRef arguments[], JSValueRef* exception)
 {
     UNUSED_PARAM(context);
     UNUSED_PARAM(object);
     UNUSED_PARAM(thisObject);
 
-    if (argc > 0 && JSValueIsStrictEqual(context, argv[0], JSValueMakeNumber(0)))
+    if (argumentCount > 0 && JSValueIsStrictEqual(context, arguments[0], JSValueMakeNumber(0)))
         return JSValueMakeNumber(1);
     
     return JSValueMakeUndefined();
 }
 
-static JSObjectRef MyObject_callAsConstructor(JSContextRef context, JSObjectRef object, size_t argc, JSValueRef argv[], JSValueRef* exception)
+static JSObjectRef MyObject_callAsConstructor(JSContextRef context, JSObjectRef object, size_t argumentCount, JSValueRef arguments[], JSValueRef* exception)
 {
     UNUSED_PARAM(context);
     UNUSED_PARAM(object);
 
-    if (argc > 0 && JSValueIsStrictEqual(context, argv[0], JSValueMakeNumber(0)))
+    if (argumentCount > 0 && JSValueIsStrictEqual(context, arguments[0], JSValueMakeNumber(0)))
         return JSValueToObject(context, JSValueMakeNumber(1), NULL);
     
     return JSValueToObject(context, JSValueMakeNumber(0), NULL);
@@ -265,13 +265,13 @@ static JSClassRef MyObject_class(JSContextRef context)
     return jsClass;
 }
 
-static JSValueRef print_callAsFunction(JSContextRef context, JSObjectRef functionObject, JSObjectRef thisObject, size_t argc, JSValueRef argv[], JSValueRef* exception)
+static JSValueRef print_callAsFunction(JSContextRef context, JSObjectRef functionObject, JSObjectRef thisObject, size_t argumentCount, JSValueRef arguments[], JSValueRef* exception)
 {
     UNUSED_PARAM(functionObject);
     UNUSED_PARAM(thisObject);
     
-    if (argc > 0) {
-        JSStringRef string = JSValueToStringCopy(context, argv[0], NULL);
+    if (argumentCount > 0) {
+        JSStringRef string = JSValueToStringCopy(context, arguments[0], NULL);
         size_t sizeUTF8 = JSStringGetMaximumUTF8CStringSize(string);
         char stringUTF8[sizeUTF8];
         JSStringGetUTF8CString(string, stringUTF8, sizeUTF8);
@@ -282,14 +282,14 @@ static JSValueRef print_callAsFunction(JSContextRef context, JSObjectRef functio
     return JSValueMakeUndefined();
 }
 
-static JSObjectRef myConstructor_callAsConstructor(JSContextRef context, JSObjectRef constructorObject, size_t argc, JSValueRef argv[], JSValueRef* exception)
+static JSObjectRef myConstructor_callAsConstructor(JSContextRef context, JSObjectRef constructorObject, size_t argumentCount, JSValueRef arguments[], JSValueRef* exception)
 {
     UNUSED_PARAM(constructorObject);
     
     JSObjectRef result = JSObjectMake(context, NULL, 0);
-    if (argc > 0) {
+    if (argumentCount > 0) {
         JSStringRef value = JSStringCreateWithUTF8CString("value");
-        JSObjectSetProperty(context, result, value, argv[0], kJSPropertyAttributeNone, NULL);
+        JSObjectSetProperty(context, result, value, arguments[0], kJSPropertyAttributeNone, NULL);
         JSStringRelease(value);
     }
     

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 2cbe36459fbc3e5d0532e403f8a5ea5655c47146..4307ce3be0818de80fd6c870fded58283b67a32c 100644 (file)
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,9 @@
+2006-07-14  Geoffrey Garen  <ggaren@apple.com>
+
+        RS by Maciej.
+        
+        Global replace in the API of argc/argv with argumentCount/arguments.
+
 2006-07-14  Geoffrey Garen  <ggaren@apple.com>
 
         Reviewed by Maciej.