Changeset 15463 in webkit for trunk/JavaScriptCore

Timestamp:

Jul 15, 2006, 6:40:07 PM (19 years ago)

Author:

ggaren

Message:

Reviewed by Maciej.

• JSObjectMakeFunctionWithBody includes a function name and named parameters now.

• API/JSObjectRef.cpp: (JSObjectMakeFunctionWithBody):
• API/JSObjectRef.h:
• API/testapi.c: (assertEqualsAsUTF8String): More informative failure reporting. (main): Test more function cases.

Location:

trunk/JavaScriptCore

Files:

• API/JSObjectRef.cpp (modified) (1 diff)
• API/JSObjectRef.h (modified) (3 diffs)
• API/testapi.c (modified) (5 diffs)
• ChangeLog (modified) (1 diff)

trunk/JavaScriptCore/API/JSObjectRef.cpp

@@ -90 +90 @@
 }
 
-JSObjectRef JSObjectMakeFunctionWithBody(JSContextRef context, JSStringRef body, JSStringRef sourceURL, int startingLineNumber, JSValueRef* exception)
-{
-    JSLock lock;
-    
-    ExecState* exec = toJS(context);
+JSObjectRef JSObjectMakeFunctionWithBody(JSContextRef context, JSStringRef name, unsigned parameterCount, JSStringRef parameterNames[], JSStringRef body, JSStringRef sourceURL, int startingLineNumber, JSValueRef* exception)
+{
+    JSLock lock;
+    
+    ExecState* exec = toJS(context);
+    UString::Rep* nameRep = name ? toJS(name) : &UString::Rep::null;
     UString::Rep* bodyRep = toJS(body);
-    UString jsSourceURL = UString(toJS(sourceURL));
-
-    if (!bodyRep)
-        bodyRep = &UString::Rep::null;
-    
-    int sid;
-    int errLine;
-    UString errMsg;
-    RefPtr<FunctionBodyNode> bodyNode = Parser::parse(jsSourceURL, startingLineNumber, bodyRep->data(), bodyRep->size(), &sid, &errLine, &errMsg);
-    if (!bodyNode) {
-        if (exception)
-            *exception = toRef(Error::create(exec, SyntaxError, errMsg, errLine, sid, jsSourceURL));
-        return 0;
-    }
-
-    ScopeChain scopeChain;
-    scopeChain.push(exec->dynamicInterpreter()->globalObject());
-    return toRef(static_cast<JSObject*>(new DeclaredFunctionImp(exec, "anonymous", bodyNode.get(), scopeChain)));
+    UString::Rep* sourceURLRep = sourceURL ? toJS(sourceURL) : &UString::Rep::null;
+    
+    Identifier nameIdentifier = nameRep ? Identifier(nameRep) : Identifier("anonymous");
+    
+    List args;
+    for (unsigned i = 0; i < parameterCount; i++)
+        args.append(jsString(UString(toJS(parameterNames[i]))));
+    args.append(jsString(UString(bodyRep)));
+
+    JSObject* result = exec->dynamicInterpreter()->builtinFunction()->construct(exec, args, nameIdentifier, UString(sourceURLRep), startingLineNumber);
+    if (exec->hadException()) {
+        if (exception)
+            *exception = toRef(exec->exception());
+        exec->clearException();
+        result = 0;
+    }
+    return toRef(result);
 }
 

trunk/JavaScriptCore/API/JSObjectRef.h

@@ -398 +398 @@
 @abstract Creates a function with a given script as its body.
 @param context The execution context to use.
+@param A JSString containting the function's name. Pass NULL to create an anonymous function.
+@param parameterCount An integer count of the number of parameter names in parameterNames.
+@param parameterNames A JSString array containing the names of the function's parameters. Pass NULL if parameterCount is 0.
 @param body A JSString containing the script to use as the function's body.
 @param sourceURL A JSString containing a URL for the script's source file. This is only used when reporting exceptions. Pass NULL if you do not care to include source file information in exceptions.
 @param startingLineNumber An integer value specifying the script's starting line number in the file located at sourceURL. This is only used when reporting exceptions.
 @param exception A pointer to a JSValueRef in which to store a syntax error exception, if any. Pass NULL if you do not care to store a syntax error exception.
-@result A JSObject that is an anonymous function, or NULL if body contains a syntax error. The returned object's prototype will be the default function prototype.
+@result A JSObject that is a function, or NULL if either body or parameterNames contains a syntax error. The object's prototype will be the default function prototype.
 @discussion Use this method when you want to execute a script repeatedly, to avoid the cost of re-parsing the script before each execution.
 */
-JSObjectRef JSObjectMakeFunctionWithBody(JSContextRef context, JSStringRef body, JSStringRef sourceURL, int startingLineNumber, JSValueRef* exception);
+JSObjectRef JSObjectMakeFunctionWithBody(JSContextRef context, JSStringRef name, unsigned parameterCount, JSStringRef parameterNames[], JSStringRef body, JSStringRef sourceURL, int startingLineNumber, JSValueRef* exception);
 
 /*!
@@ -521 +524 @@
 @param thisObject The object to use as "this," or NULL to use the global object as "this."
 @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 arguments A JSValue array of the  arguments to pass to the function. Pass NULL if argumentCount is 0.
 @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.
@@ -539 +542 @@
 @param object The JSObject to call as a constructor.
 @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 arguments A JSValue array of the  arguments to pass to the function. Pass NULL if argumentCount is 0.
 @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.

trunk/JavaScriptCore/API/testapi.c

@@ -58 +58 @@
     JSStringGetUTF8CString(valueAsString, jsBuffer, jsSize);
     
-    if (strcmp(jsBuffer, expectedValue) != 0)
-        fprintf(stderr, "assertEqualsAsUTF8String strcmp failed: %s != %s\n", jsBuffer, expectedValue);
+    unsigned i;
+    for (i = 0; jsBuffer[i]; i++)
+        if (jsBuffer[i] != expectedValue[i])
+            fprintf(stderr, "assertEqualsAsUTF8String failed at character %d: %c(%d) != %c(%d)\n", i, jsBuffer[i], jsBuffer[i], expectedValue[i], expectedValue[i]);
         
     if (jsSize < strlen(jsBuffer) + 1)
@@ -500 +502 @@
     JSValueRef v;
     JSObjectRef o;
+    JSStringRef string;
 
     result = JSEvaluateScript(context, goodSyntax, NULL, NULL, 1, NULL);
@@ -521 +524 @@
     
     JSStringRef functionBody;
+    JSObjectRef function;
     
     exception = NULL;
     functionBody = JSStringCreateWithUTF8CString("rreturn Array;");
     JSStringRef line = JSStringCreateWithUTF8CString("line");
-    assert(!JSObjectMakeFunctionWithBody(context, functionBody, NULL, 1, &exception));
+    assert(!JSObjectMakeFunctionWithBody(context, NULL, 0, NULL, functionBody, NULL, 1, &exception));
     assert(JSValueIsObject(exception));
     v = JSObjectGetProperty(context, JSValueToObject(context, exception, NULL), line, NULL);
@@ -533 +537 @@
     JSStringRelease(line);
 
+    exception = NULL;
     functionBody = JSStringCreateWithUTF8CString("return Array;");
-    JSObjectRef function = JSObjectMakeFunctionWithBody(context, functionBody, NULL, 1, NULL);
+    function = JSObjectMakeFunctionWithBody(context, NULL, 0, NULL, functionBody, NULL, 1, &exception);
     JSStringRelease(functionBody);
-
+    assert(!exception);
     assert(JSObjectIsFunction(function));
     v = JSObjectCallAsFunction(context, function, NULL, 0, NULL, NULL);
+    assert(v);
     assert(JSValueIsEqual(context, v, arrayConstructor, NULL));
-                                                  
+    
+    exception = NULL;
+    function = JSObjectMakeFunctionWithBody(context, NULL, 0, NULL, jsEmptyIString, NULL, 0, &exception);
+    assert(!exception);
+    v = JSObjectCallAsFunction(context, function, NULL, 0, NULL, &exception);
+    assert(v && !exception);
+    assert(JSValueIsUndefined(v));
+    
+    exception = NULL;
+    v = NULL;
+    JSStringRef foo = JSStringCreateWithUTF8CString("foo");
+    JSStringRef argumentNames[] = { foo };
+    functionBody = JSStringCreateWithUTF8CString("return foo;");
+    function = JSObjectMakeFunctionWithBody(context, foo, 1, argumentNames, functionBody, NULL, 1, &exception);
+    assert(function && !exception);
+    JSValueRef arguments[] = { JSValueMakeNumber(2) };
+    v = JSObjectCallAsFunction(context, function, NULL, 1, arguments, &exception);
+    JSStringRelease(foo);
+    JSStringRelease(functionBody);
+    
+    string = JSValueToStringCopy(context, function, NULL);
+    assertEqualsAsUTF8String(JSValueMakeString(string), "function foo(foo) \n{\n  return foo;\n}");
+    JSStringRelease(string);
+
     JSStringRef print = JSStringCreateWithUTF8CString("print");
     JSObjectRef printFunction = JSObjectMakeFunction(context, print_callAsFunction);
@@ -572 +601 @@
     
     functionBody = JSStringCreateWithUTF8CString("return this;");
-    function = JSObjectMakeFunctionWithBody(context, functionBody, NULL, 1, NULL);
+    function = JSObjectMakeFunctionWithBody(context, NULL, 0, NULL, functionBody, NULL, 1, NULL);
     JSStringRelease(functionBody);
     v = JSObjectCallAsFunction(context, function, NULL, 0, NULL, NULL);

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2006-07-15  Geoffrey Garen  <[email protected]>
+
+        Reviewed by Maciej.
+        
+        - JSObjectMakeFunctionWithBody includes a function name and named parameters now.
+
+        * API/JSObjectRef.cpp:
+        (JSObjectMakeFunctionWithBody):
+        * API/JSObjectRef.h:
+        * API/testapi.c:
+        (assertEqualsAsUTF8String): More informative failure reporting.
+        (main): Test more function cases.
+
 2006-07-15  Geoffrey Garen  <[email protected]>