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

Timestamp:

Oct 31, 2007, 1:29:19 AM (18 years ago)

Author:

ap

Message:

Reviewed by Darin.

​http://bugs.webkit.org/show_bug.cgi?id=11001
WebKit doesn't support RegExp.compile method

Test: fast/js/regexp-compile.html

• kjs/regexp_object.cpp: (RegExpPrototype::RegExpPrototype): (RegExpProtoFunc::callAsFunction):
• kjs/regexp_object.h: (KJS::RegExpProtoFunc::): Added RegExp.compile.

• tests/mozilla/expected.html: js1_2/regexp/compile.js now passes.

File:

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

trunk/JavaScriptCore/kjs/regexp_object.cpp

@@ -49 +49 @@
   : JSObject(objProto)
 {
+  static const Identifier* compilePropertyName = new Identifier("compile");
   static const Identifier* execPropertyName = new Identifier("exec");
   static const Identifier* testPropertyName = new Identifier("test");
 
+  putDirectFunction(new RegExpProtoFunc(exec, funcProto, RegExpProtoFunc::Compile, 0, *compilePropertyName), DontEnum);
   putDirectFunction(new RegExpProtoFunc(exec, funcProto, RegExpProtoFunc::Exec, 0, *execPropertyName), DontEnum);
   putDirectFunction(new RegExpProtoFunc(exec, funcProto, RegExpProtoFunc::Test, 0, *testPropertyName), DontEnum);
@@ -120 +122 @@
   }
   break;
+  case Compile:
+  {
+    UString source;
+    bool global = false;
+    bool ignoreCase = false;
+    bool multiline = false;
+    if (args.size() > 0) {
+      if (args[0]->isObject(&RegExpImp::info)) {
+        if (args.size() != 1)
+          return throwError(exec, TypeError, "cannot supply flags when constructing one RegExp from another.");
+
+        // Flags are mirrored on the JS object and in the implementation, while source is only preserved on the JS object.
+        RegExp* rhsRegExp = static_cast<RegExpImp*>(args[0])->regExp();
+        global = rhsRegExp->flags() & RegExp::Global;
+        ignoreCase = rhsRegExp->flags() & RegExp::IgnoreCase;
+        multiline = rhsRegExp->flags() & RegExp::Multiline;
+        source = static_cast<RegExpImp*>(args[0])->get(exec, exec->propertyNames().source)->toString(exec);
+      } else
+        source = args[0]->toString(exec);
+
+      if (!args[1]->isUndefined()) {
+        UString flags = args[1]->toString(exec);
+
+        global = (flags.find("g") >= 0);
+        ignoreCase = (flags.find("i") >= 0);
+        multiline = (flags.find("m") >= 0);
+      }
+    }
+
+    int reflags = RegExp::None;
+    if (global)
+        reflags |= RegExp::Global;
+    if (ignoreCase)
+        reflags |= RegExp::IgnoreCase;
+    if (multiline)
+        reflags |= RegExp::Multiline;
+
+    OwnPtr<RegExp> newRegExp(new RegExp(source, reflags));
+    if (!newRegExp->isValid())
+        return throwError(exec, SyntaxError, UString("Invalid regular expression: ").append(newRegExp->errorMessage()));
+
+    thisObj->putDirect(exec->propertyNames().global, jsBoolean(global), DontDelete | ReadOnly | DontEnum);
+    thisObj->putDirect(exec->propertyNames().ignoreCase, jsBoolean(ignoreCase), DontDelete | ReadOnly | DontEnum);
+    thisObj->putDirect(exec->propertyNames().multiline, jsBoolean(multiline), DontDelete | ReadOnly | DontEnum);
+    thisObj->putDirect(exec->propertyNames().source, jsString(source), DontDelete | ReadOnly | DontEnum);
+    thisObj->putDirect(exec->propertyNames().lastIndex, jsNumber(0), DontDelete | DontEnum);
+
+    static_cast<RegExpImp*>(thisObj)->setRegExp(newRegExp.release());
+    return jsUndefined();
+  }
   case ToString:
     UString result = "/" + thisObj->get(exec, exec->propertyNames().source)->toString(exec) + "/";