Changeset 21031 in webkit for trunk/JavaScriptCore/kjs/regexp_object.cpp

Timestamp:

Apr 23, 2007, 2:45:35 AM (18 years ago)

Author:

mjs

Message:

Reviewed by Darin.

• shrink RegexpObjectImp by 4 bytes

Somewhat inexplicably, this seems to be a .33% speedup on JS iBench.

• kjs/regexp_object.cpp: (KJS::RegExpObjectImpPrivate::RegExpObjectImpPrivate): (RegExpObjectImp::RegExpObjectImp): (RegExpObjectImp::performMatch): (RegExpObjectImp::arrayOfMatches): (RegExpObjectImp::getBackref): (RegExpObjectImp::getLastMatch): (RegExpObjectImp::getLastParen): (RegExpObjectImp::getLeftContext): (RegExpObjectImp::getRightContext): (RegExpObjectImp::getValueProperty): (RegExpObjectImp::putValueProperty):
• kjs/regexp_object.h:

File:

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

trunk/JavaScriptCore/kjs/regexp_object.cpp

@@ -181 +181 @@
 */
 
+struct KJS::RegExpObjectImpPrivate {
+  // Global search cache / settings
+  RegExpObjectImpPrivate() : lastInput(""), lastNumSubPatterns(0), multiline(false) { }
+  UString lastInput;
+  OwnArrayPtr<int> lastOvector;
+  unsigned lastNumSubPatterns : 31;
+  bool multiline              : 1;
+};
+
 RegExpObjectImp::RegExpObjectImp(ExecState* exec, FunctionPrototype* funcProto, RegExpPrototype* regProto)
-
-  : InternalFunctionImp(funcProto), lastInput(""), lastNumSubPatterns(0), multiline(false)
+  : InternalFunctionImp(funcProto)
+  , d(new RegExpObjectImpPrivate)
 {
   // ECMA 15.10.5.1 RegExp.prototype
@@ -211 +220 @@
     ASSERT(tmpOvector);
     
-    lastInput = s;
-    lastOvector.set(tmpOvector);
-    lastNumSubPatterns = r->subPatterns();
+    d->lastInput = s;
+    d->lastOvector.set(tmpOvector);
+    d->lastNumSubPatterns = r->subPatterns();
   }
   
@@ -224 +233 @@
   // The returned array contains 'result' as first item, followed by the list of matches
   list.append(jsString(result));
-  if ( lastOvector )
-    for ( unsigned i = 1 ; i < lastNumSubPatterns + 1 ; ++i )
+  if (d->lastOvector)
+    for (unsigned i = 1 ; i < d->lastNumSubPatterns + 1 ; ++i)
     {
-      int start = lastOvector[2*i];
+      int start = d->lastOvector[2*i];
       if (start == -1)
         list.append(jsUndefined());
       else {
-        UString substring = lastInput.substr( start, lastOvector[2*i+1] - start );
+        UString substring = d->lastInput.substr(start, d->lastOvector[2*i+1] - start);
         list.append(jsString(substring));
       }
     }
   JSObject *arr = exec->lexicalInterpreter()->builtinArray()->construct(exec, list);
-  arr->put(exec, "index", jsNumber(lastOvector[0]));
-  arr->put(exec, "input", jsString(lastInput));
+  arr->put(exec, "index", jsNumber(d->lastOvector[0]));
+  arr->put(exec, "input", jsString(d->lastInput));
   return arr;
 }
@@ -243 +252 @@
 JSValue *RegExpObjectImp::getBackref(unsigned i) const
 {
-  if (lastOvector && i < lastNumSubPatterns + 1) {
-    UString substring = lastInput.substr(lastOvector[2*i], lastOvector[2*i+1] - lastOvector[2*i] );
+  if (d->lastOvector && i < d->lastNumSubPatterns + 1) {
+    UString substring = d->lastInput.substr(d->lastOvector[2*i], d->lastOvector[2*i+1] - d->lastOvector[2*i] );
     return jsString(substring);
   } 
@@ -253 +262 @@
 JSValue *RegExpObjectImp::getLastMatch() const
 {
-  if (lastOvector) {
-    UString substring = lastInput.substr(lastOvector[0], lastOvector[1] - lastOvector[0]);
+  if (d->lastOvector) {
+    UString substring = d->lastInput.substr(d->lastOvector[0], d->lastOvector[1] - d->lastOvector[0]);
     return jsString(substring);
   }
@@ -263 +272 @@
 JSValue *RegExpObjectImp::getLastParen() const
 {
-  int i = lastNumSubPatterns;
+  int i = d->lastNumSubPatterns;
   if (i > 0) {
-    ASSERT(lastOvector);
-    UString substring = lastInput.substr(lastOvector[2*i], lastOvector[2*i+1] - lastOvector[2*i]);
+    ASSERT(d->lastOvector);
+    UString substring = d->lastInput.substr(d->lastOvector[2*i], d->lastOvector[2*i+1] - d->lastOvector[2*i]);
     return jsString(substring);
   }
@@ -275 +284 @@
 JSValue *RegExpObjectImp::getLeftContext() const
 {
-  if (lastOvector) {
-    UString substring = lastInput.substr(0, lastOvector[0]);
+  if (d->lastOvector) {
+    UString substring = d->lastInput.substr(0, d->lastOvector[0]);
     return jsString(substring);
   }
@@ -285 +294 @@
 JSValue *RegExpObjectImp::getRightContext() const
 {
-  if (lastOvector) {
-    UString s = lastInput;
-    UString substring = s.substr(lastOvector[1], s.size() - lastOvector[1]);
+  if (d->lastOvector) {
+    UString s = d->lastInput;
+    UString substring = s.substr(d->lastOvector[1], s.size() - d->lastOvector[1]);
     return jsString(substring);
   }
@@ -321 +330 @@
       return getBackref(9);
     case Input:
-      return jsString(lastInput);
+      return jsString(d->lastInput);
     case Multiline:
-      return jsBoolean(multiline);
+      return jsBoolean(d->multiline);
     case LastMatch:
       return getLastMatch();
@@ -348 +357 @@
   switch (token) {
     case Input:
-      lastInput = value->toString(exec);
+      d->lastInput = value->toString(exec);
       break;
     case Multiline:
-      multiline = value->toBoolean(exec);
+      d->multiline = value->toBoolean(exec);
       break;
     default: