Changeset 16607 in webkit for trunk/JavaScriptCore/kjs

Timestamp:

Sep 27, 2006, 7:00:32 PM (19 years ago)

Author:

kmccullo

Message:

Reviewed by GGaren.

Cleanup of previous fix which was to address Radar: 4752492

• kjs/function.cpp: (KJS::FunctionImp::addParameter): (KJS::FunctionImp::parameterString): (KJS::FunctionImp::processParameters): (KJS::FunctionImp::lengthGetter): (KJS::FunctionImp::getParameterName):
• kjs/function.h:

Location:

trunk/JavaScriptCore/kjs

Files:

• function.cpp (modified) (7 diffs)
• function.h (modified) (1 diff)

trunk/JavaScriptCore/kjs/function.cpp

@@ -54 +54 @@
     Parameter(const Identifier &n) : name(n) { }
     Identifier name;
-//    OwnPtr<Parameter> next;
   };
 
@@ -153 +152 @@
 void FunctionImp::addParameter(const Identifier &n)
 {
-    params.append(Parameter(n));
+    parameters.append(Parameter(n));
 }
 
@@ -160 +159 @@
   UString s;
 
-    for(Vector<Parameter>::const_iterator it = params.begin(); it < params.end(); it++) {
+    Vector<Parameter>::const_iterator end = parameters.end();
+    for(Vector<Parameter>::const_iterator it = parameters.begin(); it < end; it++) {
         if (!s.isEmpty())
             s += ", ";
@@ -181 +181 @@
 #endif
 
-    if(params.size() != 0) {
     ListIterator it = args.begin();
 
     JSValue  *v = *it;
-    for(Vector<Parameter>::iterator pit = params.begin(); pit < params.end(); pit++) {
+    Vector<Parameter>::const_iterator end = parameters.end();
+    for(Vector<Parameter>::iterator pit = parameters.begin(); pit < end; pit++) {
       if (it != args.end()) {
 #ifdef KJS_VERBOSE
@@ -195 +195 @@
       } else
         variable->put(exec, pit->name, jsUndefined());
-    }
   }
 #ifdef KJS_VERBOSE
@@ -225 +224 @@
 {
     FunctionImp *thisObj = static_cast<FunctionImp *>(slot.slotBase());
-    return jsNumber(thisObj->params.size());
+    return jsNumber(thisObj->parameters.size());
 }
 
@@ -268 +267 @@
 Identifier FunctionImp::getParameterName(int index)
 {
-    if(params.size() == 0)
+    ASSERT(static_cast<size_t>(index) == index);
+    if (static_cast<size_t>(index) > parameters.size())
         return Identifier::null();
   
-    if (index > static_cast<int>(params.size()))
-        return Identifier::null();
-  
-    Identifier name = params[index].name;
+    Identifier name = parameters[index].name;
 
     // Are there any subsequent parameters with the same name?
-    for (Vector<Parameter>::iterator it = &(params[index+1]); it < params.end(); it++)
+    Vector<Parameter>::const_iterator end = parameters.end();
+    for (Vector<Parameter>::iterator it = &(parameters[index+1]); it < end; it++)
         if (it->name == name)
             return Identifier::null();

trunk/JavaScriptCore/kjs/function.h

@@ -94 +94 @@
     virtual void mark();
   protected:
-    Vector<Parameter> params;
+    Vector<Parameter> parameters;
 
   private: