Changeset 33979 in webkit for trunk/JavaScriptCore/kjs/function_object.cpp

Timestamp:

May 21, 2008, 6:20:45 PM (17 years ago)

Author:

[email protected]

Message:

Merge squirrelfish branch into trunk.

File:

• trunk/JavaScriptCore/kjs/function_object.cpp (modified) (5 diffs)

trunk/JavaScriptCore/kjs/function_object.cpp

@@ -71 +71 @@
     if (thisObj->inherits(&FunctionImp::info)) {
         FunctionImp* fi = static_cast<FunctionImp*>(thisObj);
-        return jsString("function " + fi->functionName().ustring() + "(" + fi->body->paramString() + ") " + fi->body->toString());
+        return jsString("function " + fi->functionName().ustring() + "(" + fi->body->paramString() + ") " + fi->body->toSourceString());
     }
 
@@ -137 +137 @@
 }
 
-bool FunctionObjectImp::implementsConstruct() const
-{
-    return true;
+ConstructType FunctionObjectImp::getConstructData(ConstructData&)
+{
+    return ConstructTypeNative;
 }
 
@@ -163 +163 @@
     int errLine;
     UString errMsg;
-    RefPtr<FunctionBodyNode> functionBody = parser().parse<FunctionBodyNode>(sourceURL, lineNumber, body.data(), body.size(), &sourceId, &errLine, &errMsg);
-
-    // notify debugger that source has been parsed
-    // send empty sourceURL to indicate constructed code
-    Debugger* dbg = exec->dynamicGlobalObject()->debugger();
-    if (dbg && !dbg->sourceParsed(exec, sourceId, UString(), body, lineNumber, errLine, errMsg))
-        return new JSObject();
+    RefPtr<SourceProvider> source = UStringSourceProvider::create(body);
+    RefPtr<FunctionBodyNode> functionBody = parser().parse<FunctionBodyNode>(exec, sourceURL, lineNumber, source, &sourceId, &errLine, &errMsg);
 
     // No program node == syntax error - throw a syntax error
@@ -176 +171 @@
         // and return it
         return throwError(exec, SyntaxError, errMsg, errLine, sourceId, sourceURL);
-
-    ScopeChain scopeChain;
-    scopeChain.push(exec->lexicalGlobalObject());
-
-    FunctionImp* fimp = new FunctionImp(exec, functionName, functionBody.get(), scopeChain);
+    
+    functionBody->setSource(SourceRange(source, 0, source->length()));
+    ScopeChain scopeChain(exec->lexicalGlobalObject());
+
+    FunctionImp* fimp = new FunctionImp(exec, functionName, functionBody.get(), scopeChain.node());
 
     // parse parameter list. throw syntax error on illegal identifiers
@@ -213 +208 @@
     }
   
-    List consArgs;
-
     JSObject* objCons = exec->lexicalGlobalObject()->objectConstructor();
     JSObject* prototype = objCons->construct(exec, exec->emptyList());