Changeset 4206 in webkit for trunk/JavaScriptCore/kjs/ustring.cpp

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/ustring.cpp (modified) (5 diffs)

trunk/JavaScriptCore/kjs/ustring.cpp

@@ -117 +117 @@
 }
 
-UChar UChar::null((char)0);
 UString::Rep UString::Rep::null = { 0, 0, 0, 1, 1 };
 UString::Rep UString::Rep::empty = { 0, 0, 0, 1, 1 };
-UString UString::null;
 const int normalStatBufferSize = 4096;
 static char *statBuffer = 0;
@@ -155 +153 @@
   if (offset < str->rep->len)
     return *(str->rep->dat + offset);
-  else
-    return UChar::null;
+  else {
+    static UChar callerBetterNotModifyThis('\0');
+    return callerBetterNotModifyThis;
+  }
 }
 
@@ -253 +253 @@
 UString::UString()
 {
-  null.rep = &Rep::null;
   attach(&Rep::null);
 }
@@ -320 +319 @@
   memcpy(d + aSize, b.data(), bSize * sizeof(UChar));
   rep = Rep::create(d, length);
+}
+
+const UString &UString::null()
+{
+    static UString n;
+    return n;
 }
 
@@ -551 +556 @@
 {
   if (pos >= size())
-    return UChar::null;
-
-  return ((UChar *)data())[pos];
+    return '\0';
+  return data()[pos];
 }