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

Timestamp:

Feb 2, 2006, 12:22:43 AM (19 years ago)

Author:

darin

Message:

Reviewed by Maciej.

• ​http://bugzilla.opendarwin.org/show_bug.cgi?id=7005 add Noncopyable, OwnPtr, OwnArrayPtr to KXMLCore

• kxmlcore/Noncopyable.h: Added.
• kxmlcore/OwnArrayPtr.h: Added.
• kxmlcore/OwnPtr.h: Added.

• JavaScriptCore.xcodeproj/project.pbxproj: Added new files.

• kjs/function.h:
• kjs/function.cpp: Use OwnPtr for Parameter pointers.

• kjs/internal.h: Use Noncopyable for LabelStack.

• kjs/list.cpp: Use OwnArrayPtr for overflow.

• kjs/property_map.h:
• kjs/property_map.cpp: Use OwnArrayPtr for SavedProperties. Use Vector for some stack buffers.

• kjs/regexp_object.h:
• kjs/regexp_object.cpp: Use OwnArrayPtr for lastOvector.

File:

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

trunk/JavaScriptCore/kjs/function.cpp

@@ -51 +51 @@
   class Parameter {
   public:
-    Parameter(const Identifier &n) : name(n), next(0L) { }
-    ~Parameter() { delete next; }
+    Parameter(const Identifier &n) : name(n) { }
     Identifier name;
-    Parameter *next;
+    OwnPtr<Parameter> next;
   };
 
@@ -66 +65 @@
 FunctionImp::~FunctionImp()
 {
-  delete param;
 }
 
@@ -146 +144 @@
 void FunctionImp::addParameter(const Identifier &n)
 {
-  Parameter **p = &param;
+  OwnPtr<Parameter> *p = &param;
   while (*p)
     p = &(*p)->next;
 
-  *p = new Parameter(n);
+  p->set(new Parameter(n));
 }
 
@@ -156 +154 @@
 {
   UString s;
-  const Parameter *p = param;
+  const Parameter *p = param.get();
   while (p) {
     if (!s.isEmpty())
         s += ", ";
     s += p->name.ustring();
-    p = p->next;
+    p = p->next.get();
   }
 
@@ -181 +179 @@
   if (param) {
     ListIterator it = args.begin();
-    Parameter *p = param;
+    Parameter *p = param.get();
     JSValue  *v = *it;
     while (p) {
@@ -193 +191 @@
       } else
         variable->put(exec, p->name, jsUndefined());
-      p = p->next;
+      p = p->next.get();
     }
   }
@@ -224 +222 @@
 {
   FunctionImp *thisObj = static_cast<FunctionImp *>(slot.slotBase());
-  const Parameter *p = thisObj->param;
+  const Parameter *p = thisObj->param.get();
   int count = 0;
   while (p) {
     ++count;
-    p = p->next;
+    p = p->next.get();
   }
   return jsNumber(count);
@@ -274 +272 @@
 {
   int i = 0;
-  Parameter *p = param;
+  Parameter *p = param.get();
   
   if(!p)
@@ -280 +278 @@
   
   // skip to the parameter we want
-  while (i++ < index && (p = p->next))
+  while (i++ < index && (p = p->next.get()))
     ;
   
@@ -289 +287 @@
 
   // Are there any subsequent parameters with the same name?
-  while ((p = p->next))
+  while ((p = p->next.get()))
     if (p->name == name)
       return Identifier::null();