Changeset 30109 in webkit for trunk/JavaScriptCore/kjs/string_object.cpp

Timestamp:

Feb 9, 2008, 10:09:42 AM (17 years ago)

Author:

Darin Adler

Message:

Reviewed by Mitz.

• ​http://bugs.webkit.org/show_bug.cgi?id=17256 Change RegExp to start its ref count at 1, not 0

We'll want to do this to every RefCounted class, one at a time.

• kjs/nodes.h: (KJS::RegExpNode::RegExpNode): Use RegExp::create instead of new RegExp.
• kjs/regexp.cpp: (KJS::RegExp::RegExp): Marked inline, set initial ref count to 1. (KJS::RegExp::create): Added. Calls new RegExp then adopts the initial ref.
• kjs/regexp.h: Reformatted. Made the constructors private. Added static create functions that return objects already wrapped in PassRefPtr.
• kjs/regexp_object.cpp: (KJS::regExpProtoFuncCompile): Use RegExp::create instead of new RegExp. (KJS::RegExpObjectImp::construct): Ditto.
• kjs/string_object.cpp: (KJS::stringProtoFuncMatch): Ditto. (KJS::stringProtoFuncSearch): Ditto.

File:

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

trunk/JavaScriptCore/kjs/string_object.cpp

@@ -534 +534 @@
 
     UString u = s;
-    RegExp* reg;
-    RegExp* tmpReg = 0;
+    RefPtr<RegExp> reg;
     RegExpImp* imp = 0;
     if (a0->isObject() && static_cast<JSObject *>(a0)->inherits(&RegExpImp::info)) {
@@ -545 +544 @@
        *  replaced with the result of the expression new RegExp(regexp).
        */
-      reg = tmpReg = new RegExp(a0->toString(exec));
+      reg = RegExp::create(a0->toString(exec));
     }
     RegExpObjectImp* regExpObj = static_cast<RegExpObjectImp*>(exec->lexicalGlobalObject()->regExpConstructor());
     int pos;
     int matchLength;
-    regExpObj->performMatch(reg, u, 0, pos, matchLength);
+    regExpObj->performMatch(reg.get(), u, 0, pos, matchLength);
     JSValue* result;
     if (!(reg->global())) {
@@ -566 +565 @@
         lastIndex = pos;
         pos += matchLength == 0 ? 1 : matchLength;
-        regExpObj->performMatch(reg, u, pos, pos, matchLength);
+        regExpObj->performMatch(reg.get(), u, pos, pos, matchLength);
       }
       if (imp)
@@ -579 +578 @@
       }
     }
-    delete tmpReg;
     return result;
 }
@@ -591 +589 @@
 
     UString u = s;
-    RegExp* reg;
-    RegExp* tmpReg = 0;
-    if (a0->isObject() && static_cast<JSObject *>(a0)->inherits(&RegExpImp::info)) {
-      reg = static_cast<RegExpImp *>(a0)->regExp();
+    RefPtr<RegExp> reg;
+    if (a0->isObject() && static_cast<JSObject*>(a0)->inherits(&RegExpImp::info)) {
+      reg = static_cast<RegExpImp*>(a0)->regExp();
     } else { 
       /*
@@ -601 +598 @@
        *  replaced with the result of the expression new RegExp(regexp).
        */
-      reg = tmpReg = new RegExp(a0->toString(exec));
+      reg = RegExp::create(a0->toString(exec));
     }
     RegExpObjectImp* regExpObj = static_cast<RegExpObjectImp*>(exec->lexicalGlobalObject()->regExpConstructor());
     int pos;
     int matchLength;
-    regExpObj->performMatch(reg, u, 0, pos, matchLength);
-    delete tmpReg;
+    regExpObj->performMatch(reg.get(), u, 0, pos, matchLength);
     return jsNumber(pos);
 }