Changeset 21032 in webkit for trunk/JavaScriptCore/kjs/function.cpp

Timestamp:

Apr 23, 2007, 3:28:10 AM (18 years ago)

Author:

mjs

Message:

Reviewed by Darin.

• shrink FunctionImp / DeclaredFunctionImp by 4 bytes, by moving parameter list to function body

I reconciled this with a similar change in KDE kjs by Maks Orlovich <​[email protected]>.

• kjs/function.cpp: (KJS::FunctionImp::callAsFunction): (KJS::FunctionImp::passInParameters): (KJS::FunctionImp::lengthGetter): (KJS::FunctionImp::getParameterName):
• kjs/function.h:
• kjs/function_object.cpp: (FunctionProtoFunc::callAsFunction): (FunctionObjectImp::construct):
• kjs/nodes.cpp: (FunctionBodyNode::addParam): (FunctionBodyNode::paramString): (FuncDeclNode::addParams): (FuncDeclNode::processFuncDecl): (FuncExprNode::addParams): (FuncExprNode::evaluate):
• kjs/nodes.h: (KJS::Parameter::Parameter): (KJS::FunctionBodyNode::numParams): (KJS::FunctionBodyNode::paramName): (KJS::FunctionBodyNode::parameters): (KJS::FuncExprNode::FuncExprNode): (KJS::FuncDeclNode::FuncDeclNode):
• JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj: Disable 64-bit warnings because they handle size_t badly.

File:

• trunk/JavaScriptCore/kjs/function.cpp (modified) (6 diffs)

trunk/JavaScriptCore/kjs/function.cpp

@@ -52 +52 @@
 const ClassInfo FunctionImp::info = {"Function", &InternalFunctionImp::info, 0, 0};
 
-  class Parameter {
-  public:
-    Parameter() {};
-    Parameter(const Identifier& n) : name(n) { }
-    Identifier name;
-  };
-
 FunctionImp::FunctionImp(ExecState* exec, const Identifier& n, FunctionBodyNode* b)
   : InternalFunctionImp(static_cast<FunctionPrototype*>
@@ -89 +82 @@
 
   // assign user supplied arguments to parameters
-  processParameters(&newExec, args);
+  passInParameters(&newExec, args);
   // add variable declarations (initialized to undefined)
   processVarDecls(&newExec);
@@ -153 +146 @@
 }
 
-void FunctionImp::addParameter(const Identifier& n)
-{
-    if (!parameters)
-        parameters.set(new Vector<Parameter>);
-
-    parameters->append(Parameter(n));
-}
-
-UString FunctionImp::parameterString() const
-{
-    UString s;
-
-    if (!parameters)
-        return s;
-
-    for (size_t i = 0; i < parameters->size(); ++i) {
-        if (!s.isEmpty())
-            s += ", ";
-        s += parameters->at(i).name.ustring();
-    }
-
-    return s;
-}
-
-
 // ECMA 10.1.3q
-void FunctionImp::processParameters(ExecState* exec, const List& args)
-{
-    if (!parameters)
-        return;
+inline void FunctionImp::passInParameters(ExecState* exec, const List& args)
+{
+    Vector<Parameter>& parameters = body->parameters();
 
     JSObject* variable = exec->context()->variableObject();
@@ -192 +159 @@
 #endif
 
-    ListIterator it = args.begin();
-
-    JSValue * v = *it;
-    for (size_t i = 0; i < parameters->size(); ++i) {
-      if (it != args.end()) {
+    size_t size = parameters.size();
+    for (size_t i = 0; i < size; ++i) {
 #ifdef KJS_VERBOSE
-        fprintf(stderr, "setting parameter %s ", parameters->at(i).name.ascii());
-        printInfo(exec, "to", *it);
+      fprintf(stderr, "setting parameter %s ", parameters->at(i).name.ascii());
+      printInfo(exec, "to", args[i]);
 #endif
-        variable->put(exec, parameters->at(i).name, v);
-        v = ++it;
-      } else
-        variable->put(exec, parameters->at(i).name, jsUndefined());
-  }
-#ifdef KJS_VERBOSE
-  else {
-    for (int i = 0; i < args.size(); ++i)
-      printInfo(exec,"setting argument", args[i]);
-  }
-#endif
+      variable->put(exec, parameters[i].name, args[i]);
+    }
 }
 
@@ -257 +212 @@
 {
     FunctionImp* thisObj = static_cast<FunctionImp*>(slot.slotBase());
-    return jsNumber(thisObj->parameters ? thisObj->parameters->size() : 0);
+    return jsNumber(thisObj->body->numParams());
 }
 
@@ -305 +260 @@
 Identifier FunctionImp::getParameterName(int index)
 {
-    if (!parameters)
-        return CommonIdentifiers::shared()->nullIdentifier;
-
-    if (static_cast<size_t>(index) >= parameters->size())
+    Vector<Parameter>& parameters = body->parameters();
+
+    if (static_cast<size_t>(index) >= body->numParams())
         return CommonIdentifiers::shared()->nullIdentifier;
   
-    Identifier name = parameters->at(index).name;
+    Identifier name = parameters[index].name;
 
     // Are there any subsequent parameters with the same name?
-    for (size_t i = index + 1; i < parameters->size(); ++i)
-        if (parameters->at(i).name == name)
+    size_t size = parameters.size();
+    for (size_t i = index + 1; i < size; ++i)
+        if (parameters[i].name == name)
             return CommonIdentifiers::shared()->nullIdentifier;