Changeset 15463 in webkit for trunk/JavaScriptCore/API/JSObjectRef.cpp

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.

File:

• trunk/JavaScriptCore/API/JSObjectRef.cpp (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);
 }