Changeset 12523 in webkit for trunk/JavaScriptCore/kjs/regexp_object.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/regexp_object.cpp (modified) (6 diffs)

trunk/JavaScriptCore/kjs/regexp_object.cpp

@@ -195 +195 @@
                                  RegExpPrototype *regProto)
 
-  : InternalFunctionImp(funcProto), multiline(false), lastInput(""), lastOvector(0), lastNumSubPatterns(0)
+  : InternalFunctionImp(funcProto), multiline(false), lastInput(""), lastNumSubPatterns(0)
 {
   // ECMA 15.10.5.1 RegExp.prototype
@@ -202 +202 @@
   // no. of arguments for constructor
   putDirect(lengthPropertyName, jsNumber(2), ReadOnly|DontDelete|DontEnum);
-}
-
-RegExpObjectImp::~RegExpObjectImp()
-{
-  delete [] lastOvector;
 }
 
@@ -226 +221 @@
   
   if (!match.isNull()) {
-    assert(tmpOvector);
+    ASSERT(tmpOvector);
     
     lastInput = s;
-    delete [] lastOvector;
-    lastOvector = tmpOvector;
+    lastOvector.set(tmpOvector);
     lastNumSubPatterns = r->subPatterns();
   }
@@ -283 +277 @@
   int i = lastNumSubPatterns;
   if (i > 0) {
-    assert(lastOvector);
+    ASSERT(lastOvector);
     UString substring = lastInput.substr(lastOvector[2*i], lastOvector[2*i+1] - lastOvector[2*i]);
     return jsString(substring);
@@ -351 +345 @@
       return getRightContext();
     default:
-      assert(0);
+      ASSERT(0);
   }
 
@@ -372 +366 @@
       break;
     default:
-      assert(0);
+      ASSERT(0);
   }
 }