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

Timestamp:

Oct 17, 2007, 2:01:27 PM (18 years ago)

Author:

ggaren

Message:

Reviewed by Darin Adler.

Merged DeclaredFunctionImp into FunctionImp (the base class) because
the distinction between the two was unused.

Removed codeType() from FunctionImp because FunctionImp and its
subclasses all returned FunctionCode, so it was unused, practically
speaking.

Removed a different codeType() from GlobalFuncImp because it was unused.
(Perhaps it was vestigial from a time when GlobalFuncImp used to
inherit from FunctionImp.)

• bindings/runtime_method.cpp:
• bindings/runtime_method.h:
• kjs/function.cpp: (KJS::): (KJS::FunctionImp::FunctionImp): (KJS::FunctionImp::callAsFunction): (KJS::FunctionImp::construct): (KJS::FunctionImp::execute): (KJS::FunctionImp::processVarDecls):
• kjs/function.h: (KJS::FunctionImp::implementsConstruct): (KJS::FunctionImp::scope):
• kjs/function_object.cpp: (FunctionProtoFunc::callAsFunction): (FunctionObjectImp::construct):
• kjs/nodes.cpp: (FuncDeclNode::processFuncDecl): (FuncExprNode::evaluate):

File:

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

trunk/JavaScriptCore/kjs/function_object.cpp

@@ -81 +81 @@
       return throwError(exec, TypeError);
     }
-    if (thisObj->inherits(&DeclaredFunctionImp::info)) {
-        DeclaredFunctionImp *fi = static_cast<DeclaredFunctionImp*>(thisObj);
+    if (thisObj->inherits(&FunctionImp::info)) {
+        FunctionImp *fi = static_cast<FunctionImp*>(thisObj);
         return jsString("function " + fi->functionName().ustring() + "(" +
                         fi->body->paramString() + ") " + fi->body->toString());
@@ -209 +209 @@
   FunctionBodyNode *bodyNode = progNode.get();
 
-  FunctionImp* fimp = new DeclaredFunctionImp(exec, functionName, bodyNode, scopeChain);
+  FunctionImp* fimp = new FunctionImp(exec, functionName, bodyNode, scopeChain);
   
   // parse parameter list. throw syntax error on illegal identifiers