Changeset 29588 in webkit for trunk/JavaScriptCore/kjs/function.h

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/function.h (modified) (3 diffs)

trunk/JavaScriptCore/kjs/function.h

@@ -55 +55 @@
   private:
     Identifier m_name;
-  };
-
-  /**
-   * @internal
-   *
-   * The initial value of Function.prototype (and thus all objects created
-   * with the Function constructor)
-   */
-  class FunctionPrototype : public InternalFunctionImp {
-  public:
-    FunctionPrototype(ExecState *exec);
-    virtual ~FunctionPrototype();
-
-    virtual JSValue *callAsFunction(ExecState *exec, JSObject *thisObj, const List &args);
   };
 
@@ -144 +130 @@
 
     PrototypeFunction(ExecState*, int len, const Identifier&, JSMemberFunction);
+    PrototypeFunction(ExecState*, FunctionPrototype*, int len, const Identifier&, JSMemberFunction);
 
     virtual JSValue* callAsFunction(ExecState* exec, JSObject* thisObj, const List&);
@@ -151 +138 @@
   };
 
-  class GlobalFuncImp : public InternalFunctionImp {
-  public:
-    GlobalFuncImp(ExecState*, FunctionPrototype*, int i, int len, const Identifier&);
-    virtual JSValue* callAsFunction(ExecState*, JSObject* thisObj, const List& args);
-    enum { Eval, ParseInt, ParseFloat, IsNaN, IsFinite, Escape, UnEscape,
-           DecodeURI, DecodeURIComponent, EncodeURI, EncodeURIComponent
+
+    // Global Functions
+    JSValue* globalFuncEval(ExecState*, JSObject*, const List&);
+    JSValue* globalFuncParseInt(ExecState*, JSObject*, const List&);
+    JSValue* globalFuncParseFloat(ExecState*, JSObject*, const List&);
+    JSValue* globalFuncIsNaN(ExecState*, JSObject*, const List&);
+    JSValue* globalFuncIsFinite(ExecState*, JSObject*, const List&);
+    JSValue* globalFuncDecodeURI(ExecState*, JSObject*, const List&);
+    JSValue* globalFuncDecodeURIComponent(ExecState*, JSObject*, const List&);
+    JSValue* globalFuncEncodeURI(ExecState*, JSObject*, const List&);
+    JSValue* globalFuncEncodeURIComponent(ExecState*, JSObject*, const List&);
+    JSValue* globalFuncEscape(ExecState*, JSObject*, const List&);
+    JSValue* globalFuncUnescape(ExecState*, JSObject*, const List&);
 #ifndef NDEBUG
-           , KJSPrint
+    JSValue* globalFuncKJSPrint(ExecState*, JSObject*, const List&);
 #endif
-};
-  private:
-    int id;
-  };
 
-  static const double mantissaOverflowLowerBound = 9007199254740992.0;
-  double parseIntOverflow(const char* s, int length, int radix);
+    static const double mantissaOverflowLowerBound = 9007199254740992.0;
+    double parseIntOverflow(const char*, int length, int radix);
 
 } // namespace