Changeset 4206 in webkit for trunk/JavaScriptCore/kjs/identifier.h

Timestamp:

Apr 29, 2003, 11:26:29 AM (22 years ago)

Author:

darin

Message:

Reviewed by John.

• fixed 2959353 -- eliminate globally initialized objects from JavaScriptCore

• JavaScriptCore.pbproj/project.pbxproj: Added fpconst.cpp.
• kjs/fpconst.cpp: Added. Defines KJS::NaN and KJS::Inf in a way that does not require a framework init routine.

• kjs/identifier.h: Use a new KJS_IDENTIFIER_EACH_GLOBAL macro so we can do things to the entire set of identifiers easily. Also added an init function that sets up these globals in a way that does not require a framework init routine.
• kjs/identifier.cpp: (Identifier::init): Initialize the property ane globals in a way that does not require a framework init routine.

• kjs/internal.cpp: (InterpreterImp::initGlobalObject): Call Identifier::init.

• kjs/ustring.h: Remove UChar::null and UString::null, and add UString::null(). We can't have a global object of a class that has a constructor if we want to avoid framework init routines, and luckily very little code relies on these.
• kjs/ustring.cpp: (UCharReference::ref): Use our own global specific to this function rather than returning UChar::null when past the end of the string. This is dangerous because if the caller modifies it, that affects what all subsequent callers will see. (UString::Rep::create): Added assertions. (UString::UString): Got rid of code here that used to set up UString::null. (UString::null): Added. Returns a global null string, and can be used in some of the places where we used to use the UString::null global. (UString::operator[]): Fixed case where this used to return UChar::null to return '\0' instead.

• kjs/regexp.cpp: (RegExp::match): Change uses of UString::null to UString::null().

File:

• trunk/JavaScriptCore/kjs/identifier.h (modified) (2 diffs)

trunk/JavaScriptCore/kjs/identifier.h

@@ -30 +30 @@
         friend class PropertyMap;
     public:
+        static void init();
+
         Identifier() { }
         Identifier(const char *s) : _ustring(add(s)) { }
@@ -99 +101 @@
         { return Identifier::equal(a, b); }
 
-    extern const Identifier argumentsPropertyName;
-    extern const Identifier calleePropertyName;
-    extern const Identifier constructorPropertyName;
-    extern const Identifier lengthPropertyName;
-    extern const Identifier messagePropertyName;
-    extern const Identifier namePropertyName;
-    extern const Identifier prototypePropertyName;
-    extern const Identifier specialPrototypePropertyName;
-    extern const Identifier toLocaleStringPropertyName;
-    extern const Identifier toStringPropertyName;
-    extern const Identifier valueOfPropertyName;
+    // List of property names, passed to a macro so we can do set them up various
+    // ways without repeating the list.
+    #define KJS_IDENTIFIER_EACH_GLOBAL(macro) \
+        macro(arguments) \
+        macro(callee) \
+        macro(constructor) \
+        macro(length) \
+        macro(message) \
+        macro(name) \
+        macro(prototype) \
+        macro(toLocaleString) \
+        macro(toString) \
+        macro(valueOf)
+
+    // Define external global variables for all property names above (and one more).
+#if !KJS_IDENTIFIER_HIDE_GLOBALS
+    #define KJS_IDENTIFIER_DECLARE_GLOBAL(name) extern const Identifier name ## PropertyName;
+    KJS_IDENTIFIER_EACH_GLOBAL(KJS_IDENTIFIER_DECLARE_GLOBAL)
+    KJS_IDENTIFIER_DECLARE_GLOBAL(specialPrototype)
+    #undef KJS_IDENTIFIER_DECLARE_GLOBAL
+#endif
 
 }