Changeset 10818

Timestamp:

10/11/05 13:43:49 (5 years ago)

Author:

ggaren

Message:

• Implemented caching of match state inside the global RegExp object (lastParen, leftContext, rightContext, lastMatch, input).

exec(), test(), match(), search(), and replace() now dipatch regular
expression matching through the RegExp object's performMatch function,
to facilitate caching. This replaces registerRegexp and
setSubPatterns.

• Implemented the special '$' aliases (e.g. RegExp.input aliases to RegExp.$_).

• Moved support for backreferences into the new static hash table used for other special RegExp properties. Truncated backreferences at $9 to match IE, FF, and the "What's New in Netscape 1.2?" doc. (String.replace still supports double-digit backreferences.)

• Tweaked RegExp.prototype.exec to handle ginormous values in lastIndex.

Fixes 11 -- count em, 11 -- JavaScriptCore tests.

Reviewed by NOBODY (OOPS!).

• JavaScriptCore.xcodeproj/project.pbxproj: Added regexp_object.lut.h
• kjs/create_hash_table: Tweaked to allow for more exotic characters.

We now rely on the compiler to catch illegal
identifiers.

• kjs/regexp.cpp: (KJS::RegExp::RegExp):
• kjs/regexp_object.cpp: (RegExpProtoFuncImp::callAsFunction): (RegExpObjectImp::RegExpObjectImp): (RegExpObjectImp::performMatch): (RegExpObjectImp::arrayOfMatches): (RegExpObjectImp::backrefGetter): (RegExpObjectImp::getLastMatch): (RegExpObjectImp::getLastParen): (RegExpObjectImp::getLeftContext): (RegExpObjectImp::getRightContext): (RegExpObjectImp::getOwnPropertySlot): (RegExpObjectImp::getValueProperty): (RegExpObjectImp::put): (RegExpObjectImp::putValueProperty):
• kjs/regexp_object.h: (KJS::RegExpObjectImp::):
• kjs/string_object.cpp: (substituteBackreferences): (replace): (StringProtoFuncImp::callAsFunction):

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• JavaScriptCore.xcodeproj/project.pbxproj (modified) (2 diffs)
• kjs/create_hash_table (modified) (2 diffs)
• kjs/regexp.cpp (modified) (1 diff)
• kjs/regexp_object.cpp (modified) (10 diffs)
• kjs/regexp_object.h (modified) (2 diffs)
• kjs/string_object.cpp (modified) (10 diffs)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2005-10-10  Geoffrey Garen  <ggaren@apple.com>
+
+        - Implemented caching of match state inside the global RegExp object
+          (lastParen, leftContext, rightContext, lastMatch, input).
+
+          exec(), test(), match(), search(), and replace() now dipatch regular
+          expression matching through the RegExp object's performMatch function, 
+          to facilitate caching. This replaces registerRegexp and 
+          setSubPatterns.
+        
+        - Implemented the special '$' aliases (e.g. RegExp.input aliases to 
+          RegExp.$_).
+
+        - Moved support for backreferences into the new static hash table
+          used for other special RegExp properties. Truncated backreferences
+          at $9 to match IE, FF, and the "What's New in Netscape 1.2?" doc.
+          (String.replace still supports double-digit backreferences.)
+
+        - Tweaked RegExp.prototype.exec to handle ginormous values in lastIndex.
+
+        Fixes 11 -- count em, 11 -- JavaScriptCore tests.
+
+        Reviewed by NOBODY (OOPS!).
+
+        * JavaScriptCore.xcodeproj/project.pbxproj: Added regexp_object.lut.h
+        * kjs/create_hash_table: Tweaked to allow for more exotic characters.
+                                 We now rely on the compiler to catch illegal
+                                 identifiers.
+        * kjs/regexp.cpp:
+        (KJS::RegExp::RegExp):
+        * kjs/regexp_object.cpp:
+        (RegExpProtoFuncImp::callAsFunction):
+        (RegExpObjectImp::RegExpObjectImp):
+        (RegExpObjectImp::performMatch):
+        (RegExpObjectImp::arrayOfMatches):
+        (RegExpObjectImp::backrefGetter):
+        (RegExpObjectImp::getLastMatch):
+        (RegExpObjectImp::getLastParen):
+        (RegExpObjectImp::getLeftContext):
+        (RegExpObjectImp::getRightContext):
+        (RegExpObjectImp::getOwnPropertySlot):
+        (RegExpObjectImp::getValueProperty):
+        (RegExpObjectImp::put):
+        (RegExpObjectImp::putValueProperty):
+        * kjs/regexp_object.h:
+        (KJS::RegExpObjectImp::):
+        * kjs/string_object.cpp:
+        (substituteBackreferences):
+        (replace):
+        (StringProtoFuncImp::callAsFunction):
+
 2005-10-09  Darin Adler  <darin@apple.com>
 

trunk/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj

@@ -1130 +1130 @@
                                 93F1983308245BA1001E9ABC /* math_object.lut.h */,
                                 93F1983108245B9E001E9ABC /* number_object.lut.h */,
+                                14F6037308FB039300E9E573 /* regexp_object.lut.h */,
                                 93F1983508245BA6001E9ABC /* string_object.lut.h */,
                                 932F5B3F0822A1C700736975 /* Headers */,
@@ -1357 +1358 @@
 
 /* Begin PBXShellScriptBuildPhase section */
+                14F6037308FB039300E9E573 /* regexp_object.lut.h */ = {
+                        isa = PBXShellScriptBuildPhase;
+                        buildActionMask = 2147483647;
+                        files = (
+                        );
+                        inputPaths = (
+                                "kjs/create_hash_table\nkjs/create_hash_table",
+                                kjs/regexp_object.cpp,
+                        );
+                        name = regexp_object.lut.h;
+                        outputPaths = (
+                                "$(DERIVED_FILE_DIR)/regexp_object.lut.h",
+                        );
+                        runOnlyForDeploymentPostprocessing = 0;
+                        shellPath = /bin/sh;
+                        shellScript = "kjs/create_hash_table kjs/regexp_object.cpp -i > \"$DERIVED_FILE_DIR/regexp_object.lut.h\"";
+                };
                 93396BB50824516200AB803D /* chartables.c */ = {
                         isa = PBXShellScriptBuildPhase;

trunk/JavaScriptCore/kjs/create_hash_table

@@ -65 +65 @@
       @params = ();
       $inside = 0;
-        } elsif (/^([-:\@\w\[\=\]]+)\s*([\w\:-]+)\s*([\w\|]*)\s*(\w*)\s*$/ && $inside) {
+    } elsif (/^(\S+)\s*(\S+)\s*([\w\|]*)\s*(\w*)\s*$/ && $inside) {
       my $key = $1;
       my $val = $2;
@@ -77 +77 @@
       push(@params, length($param) > 0 ? $param : "0");
     } elsif ($inside) {
-      die "invalid data";
+      die "invalid data {" . $_ . "}";
     }
 }

trunk/JavaScriptCore/kjs/regexp.cpp

@@ -37 +37 @@
   int options = PCRE_UTF8;
   // Note: the Global flag is already handled by RegExpProtoFunc::execute.
+  // FIXME: That last comment is dubious. Not all RegExps get run through RegExpProtoFunc::execute.
   if (flags & IgnoreCase)
     options |= PCRE_CASELESS;

trunk/JavaScriptCore/kjs/regexp_object.cpp

@@ -24 +24 @@
 #include "regexp_object.h"
 
+#include "regexp_object.lut.h"
+
 #include <stdio.h>
 #include "value.h"
@@ -33 +35 @@
 #include "regexp.h"
 #include "error_object.h"
+#include "lookup.h"
 
 using namespace KJS;
@@ -80 +83 @@
       }
     }
+    
     return throwError(exec, TypeError);
   }
 
-  RegExpImp *reimp = static_cast<RegExpImp*>(thisObj);
-  RegExp *re = reimp->regExp();
-  UString s;
-  UString str;
   switch (id) {
-  case Exec:      // 15.10.6.2
-  case Test:
+  case Test:      // 15.10.6.2
+  case Exec:
   {
-    s = args[0]->toString(exec);
-    int length = s.size();
-    ValueImp *lastIndex = thisObj->get(exec,"lastIndex");
-    int i = lastIndex->toInt32(exec);
-    bool globalFlag = thisObj->get(exec,"global")->toBoolean(exec);
+    RegExp *regExp = static_cast<RegExpImp*>(thisObj)->regExp();
+    RegExpObjectImp* regExpObj = static_cast<RegExpObjectImp*>(exec->lexicalInterpreter()->builtinRegExp());
+
+    UString input;
+    if (args.isEmpty())
+      input = regExpObj->get(exec, "input")->toString(exec);
+    else
+      input = args[0]->toString(exec);
+
+    double lastIndex = thisObj->get(exec, "lastIndex")->toInteger(exec);
+
+    bool globalFlag = thisObj->get(exec, "global")->toBoolean(exec);
     if (!globalFlag)
-      i = 0;
-    if (i < 0 || i > length) {
-      thisObj->put(exec,"lastIndex", Number(0), DontDelete | DontEnum);
-      if (id == Test)
-        return Boolean(false);
-      else
-        return Null();
-    }
-    RegExpObjectImp* regExpObj = static_cast<RegExpObjectImp*>(exec->lexicalInterpreter()->builtinRegExp());
-    int **ovector = regExpObj->registerRegexp( re, s );
-
-    str = re->match(s, i, 0L, ovector);
-    regExpObj->setSubPatterns(re->subPatterns());
-
+      lastIndex = 0;
+    if (lastIndex < 0 || lastIndex > input.size()) {
+      thisObj->put(exec, "lastIndex", jsZero(), DontDelete | DontEnum);
+      return Null();
+    }
+
+    UString match = regExpObj->performMatch(regExp, input, static_cast<int>(lastIndex));
+    bool didMatch = !match.isNull();
+
+    // Test
     if (id == Test)
-      return Boolean(!str.isNull());
-
-    if (str.isNull()) // no match
-    {
+      return Boolean(didMatch);
+
+    // Exec
+    if (didMatch) {
       if (globalFlag)
-        thisObj->put(exec,"lastIndex",Number(0), DontDelete | DontEnum);
+        thisObj->put(exec, "lastIndex", Number(lastIndex + match.size()), DontDelete | DontEnum);
+      return regExpObj->arrayOfMatches(exec, match);
+    } else {
+      if (globalFlag)
+        thisObj->put(exec, "lastIndex", jsZero(), DontDelete | DontEnum);
       return Null();
-    }
-    else // success
-    {
-      if (globalFlag)
-        thisObj->put(exec,"lastIndex",Number( (*ovector)[1] ), DontDelete | DontEnum);
-      return regExpObj->arrayOfMatches(exec,str);
     }
   }
   break;
   case ToString:
-    s = thisObj->get(exec,"source")->toString(exec);
-    str = "/";
-    str += s;
-    str += "/";
-    if (thisObj->get(exec,"global")->toBoolean(exec)) {
-      str += "g";
-    }
-    if (thisObj->get(exec,"ignoreCase")->toBoolean(exec)) {
-      str += "i";
-    }
-    if (thisObj->get(exec,"multiline")->toBoolean(exec)) {
-      str += "m";
-    }
-    return String(str);
+    UString result = "/" + thisObj->get(exec, "source")->toString(exec) + "/";
+    if (thisObj->get(exec, "global")->toBoolean(exec)) {
+      result += "g";
+    }
+    if (thisObj->get(exec, "ignoreCase")->toBoolean(exec)) {
+      result += "i";
+    }
+    if (thisObj->get(exec, "multiline")->toBoolean(exec)) {
+      result += "m";
+    }
+    return String(result);
   }
 
@@ -163 +161 @@
 
 // ------------------------------ RegExpObjectImp ------------------------------
+
+const ClassInfo RegExpObjectImp::info = {"RegExp", &InternalFunctionImp::info, &RegExpTable, 0};
+
+/* Source for regexp_object.lut.h
+@begin RegExpTable 20
+  input           RegExpObjectImp::Input          None
+  $_              RegExpObjectImp::Input          DontEnum
+  multiline       RegExpObjectImp::Multiline      None
+  $*              RegExpObjectImp::Multiline      DontEnum
+  lastMatch       RegExpObjectImp::LastMatch      DontDelete|ReadOnly
+  $&              RegExpObjectImp::LastMatch      DontDelete|ReadOnly|DontEnum
+  lastParen       RegExpObjectImp::LastParen      DontDelete|ReadOnly
+  $+              RegExpObjectImp::LastParen      DontDelete|ReadOnly|DontEnum
+  leftContext     RegExpObjectImp::LeftContext    DontDelete|ReadOnly
+  $`              RegExpObjectImp::LeftContext    DontDelete|ReadOnly|DontEnum
+  rightContext    RegExpObjectImp::RightContext   DontDelete|ReadOnly
+  $'              RegExpObjectImp::RightContext   DontDelete|ReadOnly|DontEnum
+  $1              RegExpObjectImp::Dollar1        DontDelete|ReadOnly
+  $2              RegExpObjectImp::Dollar2        DontDelete|ReadOnly
+  $3              RegExpObjectImp::Dollar3        DontDelete|ReadOnly
+  $4              RegExpObjectImp::Dollar4        DontDelete|ReadOnly
+  $5              RegExpObjectImp::Dollar5        DontDelete|ReadOnly
+  $6              RegExpObjectImp::Dollar6        DontDelete|ReadOnly
+  $7              RegExpObjectImp::Dollar7        DontDelete|ReadOnly
+  $8              RegExpObjectImp::Dollar8        DontDelete|ReadOnly
+  $9              RegExpObjectImp::Dollar9        DontDelete|ReadOnly
+@end
+*/
 
 RegExpObjectImp::RegExpObjectImp(ExecState *exec,
@@ -168 +194 @@
                                  RegExpPrototypeImp *regProto)
 
-  : InternalFunctionImp(funcProto), lastOvector(0L), lastNrSubPatterns(0)
+  : InternalFunctionImp(funcProto), multiline(false), lastInput(""), lastOvector(0), lastNumSubPatterns(0)
 {
   // ECMA 15.10.5.1 RegExp.prototype
@@ -182 +208 @@
 }
 
-int **RegExpObjectImp::registerRegexp( const RegExp* re, const UString& s )
-{
-  lastString = s;
-  delete [] lastOvector;
-  lastOvector = 0;
-  lastNrSubPatterns = re->subPatterns();
-  return &lastOvector;
+/* 
+  To facilitate result caching, exec(), test(), match(), search(), and replace() dipatch regular
+  expression matching through the performMatch function. We use cached results to calculate, 
+  e.g., RegExp.lastMatch and RegExp.leftParen.
+*/
+UString RegExpObjectImp::performMatch(RegExp* r, const UString& s, int startOffset, int *endOffset, int **ovector)
+{
+  int tmpOffset;
+  int *tmpOvector;
+  UString match = r->match(s, startOffset, &tmpOffset, &tmpOvector);
+
+  if (endOffset)
+    *endOffset = tmpOffset;
+  if (ovector)
+    *ovector = tmpOvector;
+  
+  if (!match.isNull()) {
+    assert(tmpOvector);
+    
+    lastInput = s;
+    delete [] lastOvector;
+    lastOvector = tmpOvector;
+    lastNumSubPatterns = r->subPatterns();
+  }
+  
+  return match;
 }
 
@@ -197 +242 @@
   list.append(String(result));
   if ( lastOvector )
-    for ( unsigned i = 1 ; i < lastNrSubPatterns + 1 ; ++i )
+    for ( unsigned i = 1 ; i < lastNumSubPatterns + 1 ; ++i )
     {
       int start = lastOvector[2*i];
@@ -203 +248 @@
         list.append(jsUndefined());
       else {
-        UString substring = lastString.substr( start, lastOvector[2*i+1] - start );
+        UString substring = lastInput.substr( start, lastOvector[2*i+1] - start );
         list.append(String(substring));
       }
@@ -209 +254 @@
   ObjectImp *arr = exec->lexicalInterpreter()->builtinArray()->construct(exec, list);
   arr->put(exec, "index", Number(lastOvector[0]));
-  arr->put(exec, "input", String(lastString));
+  arr->put(exec, "input", String(lastInput));
   return arr;
 }
 
-ValueImp *RegExpObjectImp::backrefGetter(ExecState *exec, const Identifier& propertyName, const PropertySlot& slot)
-{
-  RegExpObjectImp *thisObj = static_cast<RegExpObjectImp *>(slot.slotBase());
-  unsigned i = slot.index();
-
-  if (i < thisObj->lastNrSubPatterns + 1) {
-    int *lastOvector = thisObj->lastOvector;
-    UString substring = thisObj->lastString.substr(lastOvector[2*i], lastOvector[2*i+1] - lastOvector[2*i] );
+ValueImp *RegExpObjectImp::getBackref(unsigned i) const
+{
+  if (lastOvector && i < lastNumSubPatterns + 1) {
+    UString substring = lastInput.substr(lastOvector[2*i], lastOvector[2*i+1] - lastOvector[2*i] );
     return String(substring);
   } 
@@ -227 +268 @@
 }
 
+ValueImp *RegExpObjectImp::getLastMatch() const
+{
+  if (lastOvector) {
+    UString substring = lastInput.substr(lastOvector[0], lastOvector[1] - lastOvector[0]);
+    return String(substring);
+  }
+  
+  return String("");
+}
+
+ValueImp *RegExpObjectImp::getLastParen() const
+{
+  int i = lastNumSubPatterns;
+  if (i > 0) {
+    assert(lastOvector);
+    UString substring = lastInput.substr(lastOvector[2*i], lastOvector[2*i+1] - lastOvector[2*i]);
+    return String(substring);
+  }
+    
+  return String("");
+}
+
+ValueImp *RegExpObjectImp::getLeftContext() const
+{
+  if (lastOvector) {
+    UString substring = lastInput.substr(0, lastOvector[0]);
+    return String(substring);
+  }
+  
+  return String("");
+}
+
+ValueImp *RegExpObjectImp::getRightContext() const
+{
+  if (lastOvector) {
+    UString s = lastInput;
+    UString substring = s.substr(lastOvector[1], s.size() - lastOvector[1]);
+    return String(substring);
+  }
+  
+  return String("");
+}
+
 bool RegExpObjectImp::getOwnPropertySlot(ExecState *exec, const Identifier& propertyName, PropertySlot& slot)
 {
-  UString s = propertyName.ustring();
-  if (s[0] == '$' && lastOvector)
-  {
-    bool ok;
-    unsigned i = s.substr(1).toUInt32(&ok);
-    if (ok) {
-      slot.setCustomIndex(this, i, backrefGetter);
-      return true;
-    }
-  }
-
-  return InternalFunctionImp::getOwnPropertySlot(exec, propertyName, slot);
-}
-
+  return getStaticValueSlot<RegExpObjectImp, InternalFunctionImp>(exec, &RegExpTable, this, propertyName, slot);
+}
+
+ValueImp *RegExpObjectImp::getValueProperty(ExecState *exec, int token) const
+{
+  switch (token) {
+    case Dollar1:
+      return getBackref(1);
+    case Dollar2:
+      return getBackref(2);
+    case Dollar3:
+      return getBackref(3);
+    case Dollar4:
+      return getBackref(4);
+    case Dollar5:
+      return getBackref(5);
+    case Dollar6:
+      return getBackref(6);
+    case Dollar7:
+      return getBackref(7);
+    case Dollar8:
+      return getBackref(8);
+    case Dollar9:
+      return getBackref(9);
+    case Input:
+      return jsString(lastInput);
+    case Multiline:
+      return jsBoolean(multiline);
+    case LastMatch:
+      return getLastMatch();
+    case LastParen:
+      return getLastParen();
+    case LeftContext:
+      return getLeftContext();
+    case RightContext:
+      return getRightContext();
+    default:
+      assert(0);
+  }
+
+  return String("");
+}
+
+void RegExpObjectImp::put(ExecState *exec, const Identifier &propertyName, ValueImp *value, int attr)
+{
+  lookupPut<RegExpObjectImp, InternalFunctionImp>(exec, propertyName, value, attr, &RegExpTable, this);
+}
+
+void RegExpObjectImp::putValueProperty(ExecState *exec, int token, ValueImp *value, int attr)
+{
+  switch (token) {
+    case Input:
+      lastInput = value->toString(exec);
+      break;
+    case Multiline:
+      multiline = value->toBoolean(exec);
+      break;
+    default:
+      assert(0);
+  }
+}
+  
 bool RegExpObjectImp::implementsConstruct() const
 {

trunk/JavaScriptCore/kjs/regexp_object.h

@@ -66 +66 @@
   class RegExpObjectImp : public InternalFunctionImp {
   public:
+    enum { Dollar1, Dollar2, Dollar3, Dollar4, Dollar5, Dollar6, Dollar7, Dollar8, Dollar9, 
+           Input, Multiline, LastMatch, LastParen, LeftContext, RightContext };
+    
     RegExpObjectImp(ExecState *exec,
                     FunctionPrototypeImp *funcProto,
@@ -75 +78 @@
     virtual ValueImp *callAsFunction(ExecState *exec, ObjectImp *thisObj, const List &args);
 
+    virtual void put(ExecState *, const Identifier &, ValueImp *, int attr = None);
+    void putValueProperty(ExecState *, int token, ValueImp *, int attr);
     virtual bool getOwnPropertySlot(ExecState *, const Identifier&, PropertySlot&);
-    int ** registerRegexp( const RegExp* re, const UString& s );
-    void setSubPatterns(int num) { lastNrSubPatterns = num; }
+    ValueImp *getValueProperty(ExecState *, int token) const;
+    UString performMatch(RegExp *, const UString&, int startOffset = 0, int *endOffset = 0, int **ovector = 0);
     ObjectImp *arrayOfMatches(ExecState *exec, const UString &result) const;
+    
+    virtual const ClassInfo *classInfo() const { return &info; }
   private:
-    static ValueImp *backrefGetter(ExecState *exec, const Identifier&, const PropertySlot& slot);
-  
-    UString lastString;
+    ValueImp *getBackref(unsigned) const;
+    ValueImp *getLastMatch() const;
+    ValueImp *getLastParen() const;
+    ValueImp *getLeftContext() const;
+    ValueImp *getRightContext() const;
+
+    // Global search cache / settings
+    bool multiline;
+    UString lastInput;
     int *lastOvector;
-    unsigned lastNrSubPatterns;
+    unsigned lastNumSubPatterns;
+    
+    static const ClassInfo info;
   };
 

trunk/JavaScriptCore/kjs/string_object.cpp

@@ -233 +233 @@
 }
 
-static inline UString substituteBackreferences(const UString &replacement, const UString &source, int **ovector, RegExp *reg)
+static inline UString substituteBackreferences(const UString &replacement, const UString &source, int *ovector, RegExp *reg)
 {
   UString substitutedReplacement = replacement;
@@ -247 +247 @@
     unsigned backrefIndex = substitutedReplacement.substr(i+1,1).toUInt32(&converted, false /* tolerate empty string */);
     if (converted && backrefIndex <= (unsigned)reg->subPatterns()) {
-      int backrefStart = (*ovector)[2*backrefIndex];
-      int backrefLength = (*ovector)[2*backrefIndex+1] - backrefStart;
+      int backrefStart = ovector[2*backrefIndex];
+      int backrefLength = ovector[2*backrefIndex+1] - backrefStart;
       substitutedReplacement = substitutedReplacement.substr(0,i)
         + source.substr(backrefStart, backrefLength)
@@ -289 +289 @@
     // This is either a loop (if global is set) or a one-way (if not).
     do {
-      int **ovector = regExpObj->registerRegexp( reg, source );
-      UString matchString = reg->match(source, startPosition, &matchIndex, ovector);
-      regExpObj->setSubPatterns(reg->subPatterns());
+      int *ovector;
+      UString matchString = regExpObj->performMatch(reg, source, startPosition, &matchIndex, &ovector);
       if (matchIndex == -1)
         break;
@@ -299 +298 @@
 
       if (replacementFunction) {
-          int completeMatchStart = (*ovector)[0];
+          int completeMatchStart = ovector[0];
           List args;
 
@@ -305 +304 @@
           
           for (unsigned i = 0; i < reg->subPatterns(); i++) {
-              int matchStart = (*ovector)[(i + 1) * 2];
-              int matchLen = (*ovector)[(i + 1) * 2 + 1] - matchStart;
+              int matchStart = ovector[(i + 1) * 2];
+              int matchLen = ovector[(i + 1) * 2 + 1] - matchStart;
               
               args.append(jsString(source.substr(matchStart, matchLen)));
@@ -455 +454 @@
     RegExp *reg, *tmpReg = 0;
     RegExpImp *imp = 0;
-    if (a0->isObject() && a0->getObject()->inherits(&RegExpImp::info))
-    {
+    if (a0->isObject() && a0->getObject()->inherits(&RegExpImp::info)) {
       imp = static_cast<RegExpImp *>(a0);
       reg = imp->regExp();
-    }
-    else
-    { /*
+    } else { 
+      /*
        *  ECMA 15.5.4.12 String.prototype.search (regexp)
        *  If regexp is not an object whose [[Class]] property is "RegExp", it is
@@ -469 +466 @@
     }
     RegExpObjectImp* regExpObj = static_cast<RegExpObjectImp*>(exec->lexicalInterpreter()->builtinRegExp());
-    int **ovector = regExpObj->registerRegexp(reg, u);
-    UString mstr = reg->match(u, -1, &pos, ovector);
+    UString mstr = regExpObj->performMatch(reg, u, 0, &pos);
     if (id == Search) {
       result = Number(pos);
@@ -480 +476 @@
           result = Null();
         } else {
-          regExpObj->setSubPatterns(reg->subPatterns());
           result = regExpObj->arrayOfMatches(exec,mstr);
         }
@@ -494 +489 @@
           lastIndex = pos;
           pos += mstr.isEmpty() ? 1 : mstr.size();
-          delete [] *ovector;
-          mstr = reg->match(u, pos, &pos, ovector);
+          mstr = regExpObj->performMatch(reg, u, pos, &pos);
         }
         if (imp)
@@ -515 +509 @@
     result = replace(exec, s, a0, a1);
     break;
-  case Slice: // http://developer.netscape.com/docs/manuals/js/client/jsref/string.htm#1194366
+  case Slice:
     {
         // The arg processing is very much like ArrayProtoFunc::Slice