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

Timestamp:

Jan 17, 2008, 11:27:33 AM (17 years ago)

Author:

[email protected]

Message:

Reviewed by Darin.

Fix for ​http://bugs.webkit.org/show_bug.cgi?id=16901
Convert remaining JS function objects to use the new PrototypeFunction class

• Moves Boolean, Function, RegExp, Number, Object and Global functions to their own static function implementations so that they can be used with the PrototypeFunction class. SunSpider says this is 1.003x as fast.

• kjs/JSGlobalObject.cpp: (KJS::JSGlobalObject::reset):
• kjs/array_object.h:
• kjs/bool_object.cpp: (KJS::BooleanInstance::BooleanInstance): (KJS::BooleanPrototype::BooleanPrototype): (KJS::booleanProtoFuncToString): (KJS::booleanProtoFuncValueOf): (KJS::BooleanObjectImp::BooleanObjectImp): (KJS::BooleanObjectImp::implementsConstruct): (KJS::BooleanObjectImp::construct): (KJS::BooleanObjectImp::callAsFunction):
• kjs/bool_object.h: (KJS::BooleanInstance::classInfo):
• kjs/error_object.cpp: (KJS::ErrorPrototype::ErrorPrototype): (KJS::errorProtoFuncToString):
• kjs/error_object.h:
• kjs/function.cpp: (KJS::globalFuncEval): (KJS::globalFuncParseInt): (KJS::globalFuncParseFloat): (KJS::globalFuncIsNaN): (KJS::globalFuncIsFinite): (KJS::globalFuncDecodeURI): (KJS::globalFuncDecodeURIComponent): (KJS::globalFuncEncodeURI): (KJS::globalFuncEncodeURIComponent): (KJS::globalFuncEscape): (KJS::globalFuncUnEscape): (KJS::globalFuncKJSPrint): (KJS::PrototypeFunction::PrototypeFunction):
• kjs/function.h:
• kjs/function_object.cpp: (KJS::FunctionPrototype::FunctionPrototype): (KJS::functionProtoFuncToString): (KJS::functionProtoFuncApply): (KJS::functionProtoFuncCall):
• kjs/function_object.h:
• kjs/number_object.cpp: (KJS::NumberPrototype::NumberPrototype): (KJS::numberProtoFuncToString): (KJS::numberProtoFuncToLocaleString): (KJS::numberProtoFuncValueOf): (KJS::numberProtoFuncToFixed): (KJS::numberProtoFuncToExponential): (KJS::numberProtoFuncToPrecision):
• kjs/number_object.h: (KJS::NumberInstance::classInfo): (KJS::NumberObjectImp::classInfo): (KJS::NumberObjectImp::):
• kjs/object_object.cpp: (KJS::ObjectPrototype::ObjectPrototype): (KJS::objectProtoFuncValueOf): (KJS::objectProtoFuncHasOwnProperty): (KJS::objectProtoFuncIsPrototypeOf): (KJS::objectProtoFuncDefineGetter): (KJS::objectProtoFuncDefineSetter): (KJS::objectProtoFuncLookupGetter): (KJS::objectProtoFuncLookupSetter): (KJS::objectProtoFuncPropertyIsEnumerable): (KJS::objectProtoFuncToLocaleString): (KJS::objectProtoFuncToString):
• kjs/object_object.h:
• kjs/regexp_object.cpp: (KJS::RegExpPrototype::RegExpPrototype): (KJS::regExpProtoFuncTest): (KJS::regExpProtoFuncExec): (KJS::regExpProtoFuncCompile): (KJS::regExpProtoFuncToString):
• kjs/regexp_object.h:

File:

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

trunk/JavaScriptCore/kjs/regexp_object.cpp

@@ -1 +1 @@
 /*
  *  Copyright (C) 1999-2000 Harri Porten ([email protected])
- *  Copyright (C) 2003, 2007 Apple Inc. All Rights Reserved.
+ *  Copyright (C) 2003, 2007, 2008 Apple Inc. All Rights Reserved.
  *
  *  This library is free software; you can redistribute it and/or
@@ -40 +40 @@
 // ------------------------------ RegExpPrototype ---------------------------
 
+static JSValue* regExpProtoFuncTest(ExecState*, JSObject*, const List&);
+static JSValue* regExpProtoFuncExec(ExecState*, JSObject*, const List&);
+static JSValue* regExpProtoFuncCompile(ExecState*, JSObject*, const List&);
+static JSValue* regExpProtoFuncToString(ExecState*, JSObject*, const List&);
+
 // ECMA 15.10.5
 
 const ClassInfo RegExpPrototype::info = { "RegExpPrototype", 0, 0 };
 
-RegExpPrototype::RegExpPrototype(ExecState *exec,
-                                       ObjectPrototype *objProto,
-                                       FunctionPrototype *funcProto)
-  : 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);
-  putDirectFunction(new RegExpProtoFunc(exec, funcProto, RegExpProtoFunc::ToString, 0, exec->propertyNames().toString), DontEnum);
-}
-
-// ------------------------------ RegExpProtoFunc ---------------------------
-
-RegExpProtoFunc::RegExpProtoFunc(ExecState* exec, FunctionPrototype* funcProto, int i, int len, const Identifier& name)
-   : InternalFunctionImp(funcProto, name), id(i)
-{
-  putDirect(exec->propertyNames().length, len, DontDelete | ReadOnly | DontEnum);
-}
-
-JSValue *RegExpProtoFunc::callAsFunction(ExecState *exec, JSObject *thisObj, const List &args)
-{
-  if (!thisObj->inherits(&RegExpImp::info)) {
-    if (thisObj->inherits(&RegExpPrototype::info)) {
-      switch (id) {
-        case ToString: return jsString("//");
-      }
-    }
+RegExpPrototype::RegExpPrototype(ExecState* exec, ObjectPrototype* objectPrototype, FunctionPrototype* functionPrototype)
+    : JSObject(objectPrototype)
+{
+    static const Identifier* compilePropertyName = new Identifier("compile");
+    static const Identifier* execPropertyName = new Identifier("exec");
+    static const Identifier* testPropertyName = new Identifier("test");
+
+    putDirectFunction(new PrototypeFunction(exec, functionPrototype, 0, *compilePropertyName, regExpProtoFuncCompile), DontEnum);
+    putDirectFunction(new PrototypeFunction(exec, functionPrototype, 0, *execPropertyName, regExpProtoFuncExec), DontEnum);
+    putDirectFunction(new PrototypeFunction(exec, functionPrototype, 0, *testPropertyName, regExpProtoFuncTest), DontEnum);
+    putDirectFunction(new PrototypeFunction(exec, functionPrototype, 0, exec->propertyNames().toString, regExpProtoFuncToString), DontEnum);
+}
+
+// ------------------------------ Functions ---------------------------
     
-    return throwError(exec, TypeError);
-  }
-
-    switch (id) {
-        case Test:
-            return static_cast<RegExpImp*>(thisObj)->test(exec, args);
-        case Exec:
-            return static_cast<RegExpImp*>(thisObj)->exec(exec, args);
-  case Compile:
-  {
+JSValue* regExpProtoFuncTest(ExecState* exec, JSObject* thisObj, const List& args)
+{
+    if (!thisObj->inherits(&RegExpImp::info))
+        return throwError(exec, TypeError);
+
+    return static_cast<RegExpImp*>(thisObj)->test(exec, args);
+}
+
+JSValue* regExpProtoFuncExec(ExecState* exec, JSObject* thisObj, const List& args)
+{
+    if (!thisObj->inherits(&RegExpImp::info))
+        return throwError(exec, TypeError);
+
+    return static_cast<RegExpImp*>(thisObj)->exec(exec, args);
+}
+
+JSValue* regExpProtoFuncCompile(ExecState* exec, JSObject* thisObj, const List& args)
+{
+    if (!thisObj->inherits(&RegExpImp::info))
+        return throwError(exec, TypeError);
+
     RefPtr<RegExp> regExp;
     JSValue* arg0 = args[0];
@@ -91 +90 @@
     
     if (arg0->isObject(&RegExpImp::info)) {
-      if (!arg1->isUndefined())
-        return throwError(exec, TypeError, "Cannot supply flags when constructing one RegExp from another.");
-      regExp = static_cast<RegExpImp*>(arg0)->regExp();
+        if (!arg1->isUndefined())
+            return throwError(exec, TypeError, "Cannot supply flags when constructing one RegExp from another.");
+        regExp = static_cast<RegExpImp*>(arg0)->regExp();
     } else {
-      UString pattern = args.isEmpty() ? UString("") : arg0->toString(exec);
-      UString flags = arg1->isUndefined() ? UString("") : arg1->toString(exec);
-      regExp = new RegExp(pattern, flags);
+        UString pattern = args.isEmpty() ? UString("") : arg0->toString(exec);
+        UString flags = arg1->isUndefined() ? UString("") : arg1->toString(exec);
+        regExp = new RegExp(pattern, flags);
     }
 
     if (!regExp->isValid())
-      return throwError(exec, SyntaxError, UString("Invalid regular expression: ").append(regExp->errorMessage()));
+        return throwError(exec, SyntaxError, UString("Invalid regular expression: ").append(regExp->errorMessage()));
 
     static_cast<RegExpImp*>(thisObj)->setRegExp(regExp.release());
     static_cast<RegExpImp*>(thisObj)->put(exec, exec->propertyNames().lastIndex, jsNumber(0), DontDelete|DontEnum);
     return jsUndefined();
-  }
-  case ToString:
+}
+
+JSValue* regExpProtoFuncToString(ExecState* exec, JSObject* thisObj, const List&)
+{
+    if (!thisObj->inherits(&RegExpImp::info)) {
+        if (thisObj->inherits(&RegExpPrototype::info))
+            return jsString("//");
+        return throwError(exec, TypeError);
+    }
+
     UString result = "/" + thisObj->get(exec, exec->propertyNames().source)->toString(exec) + "/";
-    if (thisObj->get(exec, exec->propertyNames().global)->toBoolean(exec)) {
-      result += "g";
-    }
-    if (thisObj->get(exec, exec->propertyNames().ignoreCase)->toBoolean(exec)) {
-      result += "i";
-    }
-    if (thisObj->get(exec, exec->propertyNames().multiline)->toBoolean(exec)) {
-      result += "m";
-    }
+    if (thisObj->get(exec, exec->propertyNames().global)->toBoolean(exec))
+        result += "g";
+    if (thisObj->get(exec, exec->propertyNames().ignoreCase)->toBoolean(exec))
+        result += "i";
+    if (thisObj->get(exec, exec->propertyNames().multiline)->toBoolean(exec))
+        result += "m";
     return jsString(result);
-  }
-
-  return jsUndefined();
+
+    return jsUndefined();
 }