Changeset 26715 in webkit for trunk/JavaScriptCore/kjs/function.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.cpp (modified) (11 diffs)

trunk/JavaScriptCore/kjs/function.cpp

@@ -49 +49 @@
 // ----------------------------- FunctionImp ----------------------------------
 
-const ClassInfo FunctionImp::info = {"Function", &InternalFunctionImp::info, 0, 0};
-
-FunctionImp::FunctionImp(ExecState* exec, const Identifier& n, FunctionBodyNode* b)
-  : InternalFunctionImp(static_cast<FunctionPrototype*>
-                        (exec->lexicalInterpreter()->builtinFunctionPrototype()), n)
+const ClassInfo FunctionImp::info = { "Function", &InternalFunctionImp::info, 0, 0 };
+
+FunctionImp::FunctionImp(ExecState* exec, const Identifier& name, FunctionBodyNode* b, const ScopeChain& sc)
+  : InternalFunctionImp(static_cast<FunctionPrototype*>(exec->lexicalInterpreter()->builtinFunctionPrototype()), name)
   , body(b)
+  , _scope(sc)
 {
 }
@@ -64 +64 @@
 }
 
-FunctionImp::~FunctionImp()
-{
-}
-
 JSValue* FunctionImp::callAsFunction(ExecState* exec, JSObject* thisObj, const List& args)
 {
@@ -74 +70 @@
   // enter a new execution context
   Context ctx(globalObj, exec->dynamicInterpreter(), thisObj, body.get(),
-                 codeType(), exec->context(), this, &args);
+                 FunctionCode, exec->context(), this, &args);
   ExecState newExec(exec->dynamicInterpreter(), &ctx);
   if (exec->hadException())
@@ -80 +76 @@
   ctx.setExecState(&newExec);
 
-  // assign user supplied arguments to parameters
   passInParameters(&newExec, args);
-  // add variable declarations (initialized to undefined)
   processVarDecls(&newExec);
 
@@ -89 +83 @@
   int lineno = -1;
   if (dbg) {
-    if (inherits(&DeclaredFunctionImp::info)) {
-      sid = static_cast<DeclaredFunctionImp*>(this)->body->sourceId();
-      lineno = static_cast<DeclaredFunctionImp*>(this)->body->firstLine();
-    }
+    sid = body->sourceId();
+    lineno = body->firstLine();
 
     bool cont = dbg->callEvent(&newExec,sid,lineno,this,args);
@@ -113 +105 @@
 
   if (dbg) {
-    if (inherits(&DeclaredFunctionImp::info))
-      lineno = static_cast<DeclaredFunctionImp*>(this)->body->lastLine();
+    lineno = body->lastLine();
 
     if (comp.complType() == Throw)
@@ -147 +138 @@
       variable->put(exec, parameters[i], args[i], DontDelete);
     }
-}
-
-void FunctionImp::processVarDecls(ExecState*)
-{
 }
 
@@ -256 +243 @@
 }
 
-// ------------------------------ DeclaredFunctionImp --------------------------
-
-// ### is "Function" correct here?
-const ClassInfo DeclaredFunctionImp::info = {"Function", &FunctionImp::info, 0, 0};
-
-DeclaredFunctionImp::DeclaredFunctionImp(ExecState* exec, const Identifier& n,
-                                         FunctionBodyNode* b, const ScopeChain& sc)
-  : FunctionImp(exec, n, b)
-{
-  setScope(sc);
-}
-
-bool DeclaredFunctionImp::implementsConstruct() const
-{
-  return true;
-}
-
 // ECMA 13.2.2 [[Construct]]
-JSObject* DeclaredFunctionImp::construct(ExecState* exec, const List& args)
+JSObject* FunctionImp::construct(ExecState* exec, const List& args)
 {
   JSObject* proto;
@@ -293 +263 @@
 }
 
-Completion DeclaredFunctionImp::execute(ExecState* exec)
+Completion FunctionImp::execute(ExecState* exec)
 {
   Completion result = body->execute(exec);
@@ -302 +272 @@
 }
 
-void DeclaredFunctionImp::processVarDecls(ExecState* exec)
+void FunctionImp::processVarDecls(ExecState* exec)
 {
     body->processDeclarations(exec);
@@ -525 +495 @@
 {
   putDirect(exec->propertyNames().length, len, DontDelete|ReadOnly|DontEnum);
-}
-
-CodeType GlobalFuncImp::codeType() const
-{
-  return id == Eval ? EvalCode : codeType();
 }