Changeset 11731 in webkit for trunk/JavaScriptCore

Timestamp:

Dec 22, 2005, 1:07:37 PM (19 years ago)

Author:

andersca

Message:

2005-12-22 Anders Carlsson <​[email protected]>

Reviewed by Eric and Darin.

• fix ​http://bugzilla.opendarwin.org/show_bug.cgi?id=6196 Would like to be able to define prototypes in headers

• kjs/lookup.h: Move ClassName from KJS_DECLARE_PROTOTYPE to KJS_IMPLEMENT_PROTOTYPE. Also, namespace all macros by prefixing them with KJS_.

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (2 diffs)
• kjs/lookup.h (modified) (3 diffs)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2005-12-22  Anders Carlsson  <[email protected]>
+
+        Reviewed by Eric and Darin.
+
+        - fix http://bugzilla.opendarwin.org/show_bug.cgi?id=6196
+        Would like to be able to define prototypes in headers
+        
+        * kjs/lookup.h:
+        Move ClassName from KJS_DECLARE_PROTOTYPE to KJS_IMPLEMENT_PROTOTYPE.
+        Also, namespace all macros by prefixing them with KJS_. 
+
 2005-12-22  Darin Adler  <[email protected]>
 
@@ -28 +39 @@
         (KXMLCore::operator!=): Ditto.
 
+>>>>>>> 1.920
 2005-12-21  Timothy Hatcher  <[email protected]>
 

trunk/JavaScriptCore/kjs/lookup.h

@@ -285 +285 @@
    *
    * Using those macros is very simple: define the hashtable (e.g. "DOMNodeProtoTable"), then
-   * DEFINE_PROTOTYPE("DOMNode",DOMNodeProto)
-   * IMPLEMENT_PROTOFUNC(DOMNodeProtoFunc)
-   * IMPLEMENT_PROTOTYPE(DOMNodeProto,DOMNodeProtoFunc)
+   * KJS_DEFINE_PROTOTYPE(DOMNodeProto)
+   * KJS_IMPLEMENT_PROTOFUNC(DOMNodeProtoFunc)
+   * KJS_IMPLEMENT_PROTOTYPE("DOMNode", DOMNodeProto,DOMNodeProtoFunc)
    * and use DOMNodeProto::self(exec) as prototype in the DOMNode constructor.
    * If the prototype has a "parent prototype", e.g. DOMElementProto falls back on DOMNodeProto,
    * then the last line will use IMPLEMENT_PROTOTYPE_WITH_PARENT, with DOMNodeProto as last argument.
    */
-#define DEFINE_PROTOTYPE(ClassName,ClassProto) \
+#define KJS_DEFINE_PROTOTYPE(ClassProto) \
   class ClassProto : public JSObject { \
     friend JSObject *cacheGlobalObject<ClassProto>(ExecState *exec, const Identifier &propertyName); \
   public: \
-    static JSObject *self(ExecState *exec) \
-    { \
-      return cacheGlobalObject<ClassProto>(exec, "[[" ClassName ".prototype]]"); \
-    } \
+    static JSObject *ClassProto::self(ExecState *exec); \
+    virtual const ClassInfo *classInfo() const { return &info; } \
+    static const ClassInfo info; \
+    bool getOwnPropertySlot(ExecState *, const Identifier&, PropertySlot&); \
   protected: \
     ClassProto( ExecState *exec ) \
       : JSObject( exec->lexicalInterpreter()->builtinObjectPrototype() ) {} \
     \
-  public: \
-    virtual const ClassInfo *classInfo() const { return &info; } \
-    static const ClassInfo info; \
-    bool getOwnPropertySlot(ExecState *, const Identifier&, PropertySlot&); \
-  }; \
-  const ClassInfo ClassProto::info = { ClassName, 0, &ClassProto##Table, 0 };
-
-#define IMPLEMENT_PROTOTYPE(ClassProto,ClassFunc) \
+  };
+
+#define KJS_IMPLEMENT_PROTOTYPE(ClassName, ClassProto,ClassFunc) \
+    const ClassInfo ClassProto::info = { ClassName, 0, &ClassProto##Table, 0 }; \
+    JSObject *ClassProto::self(ExecState *exec) \
+    { \
+      return cacheGlobalObject<ClassProto>(exec, "[[" ClassName ".prototype]]"); \
+    } \
     bool ClassProto::getOwnPropertySlot(ExecState *exec, const Identifier& propertyName, PropertySlot& slot) \
     { \
@@ -317 +317 @@
     }
 
-#define IMPLEMENT_PROTOTYPE_WITH_PARENT(ClassProto,ClassFunc,ParentProto)  \
+#define KJS_IMPLEMENT_PROTOTYPE_WITH_PARENT(ClassName, ClassProto,ClassFunc,ParentProto)  \
+    const ClassInfo ClassProto::info = { ClassName, 0, &ClassProto##Table, 0 }; \
+    JSObject *ClassProto::self(ExecState *exec) \
+    { \
+      return cacheGlobalObject<ClassProto>(exec, "[[" ClassName ".prototype]]"); \
+    } \
     bool ClassProto::getOwnPropertySlot(ExecState *exec, const Identifier& propertyName, PropertySlot& slot) \
     { \
@@ -325 +330 @@
     }
 
-#define IMPLEMENT_PROTOFUNC(ClassFunc) \
+#define KJS_IMPLEMENT_PROTOFUNC(ClassFunc) \
   class ClassFunc : public DOMFunction { \
   public: \