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

Timestamp:

Aug 12, 2002, 1:14:02 PM (23 years ago)

Author:

darin

Message:

top level:

• Tests/WebFoundation-Misc/ifnsurlextensions-test.m: (TestURLCommon): Add tests for the new WebNSURLExtras methods.

• Tests/libiftest/IFCheckLeaks.c: (IFCheckLeaksAtExit): Remove workaround for CFPreferences race condition; it's now in WebFoundation.

JavaScriptCore:

Speed improvements. 19% faster on cvs-js-performance, 1% on cvs-static-urls.

Use global string objects for length and other common property names rather
than constantly making and destroying them. Use integer versions of get() and
other related calls rather than always making a string.

Also get rid of many unneeded constructors, destructors, copy constructors, and
assignment operators. And make some functions non-virtual.

• kjs/internal.h:
• kjs/internal.cpp: (NumberImp::toUInt32): Implement. (ReferenceImp::ReferenceImp): Special case for numeric property names. (ReferenceImp::getPropertyName): Moved guts here from ValueImp. Handle numeric case. (ReferenceImp::getValue): Moved guts here from ValueImp. Handle numeric case. (ReferenceImp::putValue): Moved guts here from ValueImp. Handle numeric case. (ReferenceImp::deleteValue): Added. Handle numeric case.

• kjs/array_object.h:
• kjs/array_object.cpp: All-new array implementation that stores the elements in a C++ array rather than in a property map. (ArrayInstanceImp::ArrayInstanceImp): Allocate the C++ array. (ArrayInstanceImp::~ArrayInstanceImp): Delete the C++ array. (ArrayInstanceImp::get): Implement both the old version and the new overload that takes an unsigned index for speed. (ArrayInstanceImp::put): Implement both the old version and the new overload that takes an unsigned index for speed. (ArrayInstanceImp::hasProperty): Implement both the old version and the new overload that takes an unsigned index for speed. (ArrayInstanceImp::deleteProperty): Implement both the old version and the new overload that takes an unsigned index for speed. (ArrayInstanceImp::setLength): Added. Used by the above to resize the array. (ArrayInstanceImp::mark): Mark the elements of the array too. (ArrayPrototypeImp::ArrayPrototypeImp): Pass the length to the array instance constructor.

• kjs/bool_object.cpp:
• kjs/date_object.cpp:
• kjs/error_object.cpp:
• kjs/function.cpp:
• kjs/function_object.cpp:
• kjs/math_object.cpp:
• kjs/nodes.cpp:
• kjs/nodes.h:
• kjs/number_object.cpp:
• kjs/object_object.cpp:
• kjs/regexp_object.cpp:
• kjs/string_object.cpp:

• kjs/nodes2string.cpp: (SourceStream::operator<<): Add a special case for char now that you can't create a UString from a char implicitly.

• kjs/object.h:
• kjs/object.cpp: (ObjectImp::get): Call through to the string version if the numeric version is not implemented. (ObjectImp::put): Call through to the string version if the numeric version is not implemented. (ObjectImp::hasProperty): Call through to the string version if the numeric version is not implemented. (ObjectImp::deleteProperty): Call through to the string version if the numeric version is not implemented.

• kjs/types.h:
• kjs/types.cpp: (Reference::Reference): Added constructors for the numeric property name case.

• kjs/ustring.h: Made the constructor that turns a character into a string be explicit so we don't get numbers that turn themselves into strings.
• kjs/ustring.cpp: (UString::UString): Detect the empty string case, and use a shared empty string. (UString::find): Add an overload for single character finds. (UString::rfind): Add an overload for single character finds. (KJS::operator==): Fix bug where it would call strlen(0) if the first string was not null. Also handle non-ASCII characters consistently with the rest of the code by casting to unsigned char just in case.

• kjs/value.h: Make ValueImp and all subclasses non-copyable and non-assignable.
• kjs/value.cpp: (ValueImp::toUInt32): New interface, mainly useful so we can detect array indices and not turn them into strings and back. (ValueImp::toInteger): Use the new toUInt32. Probably can use more improvement. (ValueImp::toInt32): Use the new toUInt32. Probably can use more improvement. (ValueImp::toUInt16): Use the new toUInt32. Probably can use more improvement. (ValueImp::getBase): Remove handling of the Reference case. That's in ReferenceImp now. (ValueImp::getPropertyName): Remove handling of the Reference case. That's in ReferenceImp now. (ValueImp::getValue): Remove handling of the Reference case. That's in ReferenceImp now. (ValueImp::putValue): Remove handling of the Reference case. That's in ReferenceImp now. (ValueImp::deleteValue): Added. Used so we can do delete the same way we do put.

WebFoundation:

• CacheLoader.subproj/WebHTTPResourceLoader.m: (-[WebHTTPProtocolHandler createWFLoadRequest]): Fix handling of paths with queries and some other subtle path and port number handling issues by using _web_hostWithPort and _web_pathWithQuery.

• Misc.subproj/WebNSURLExtras.h:
• Misc.subproj/WebNSURLExtras.m: (-[NSURL _web_hostWithPort]): Added. (-[NSURL _web_pathWithQuery]): Added.

• CacheLoader.subproj/WebResourceLoad.m: (initLoader): Get some random preference before creating threads. This makes it impossible to run into the CFPreferences race condition.

WebCore:

• force-clean-timestamp: Need a full build because of KJS changes.
• khtml/ecma/kjs_window.h: Need to store an Object, not an ObjectImp, because there's no way to copy an ObjectImp. KJS changes caught this mistake.

File:

• trunk/JavaScriptCore/kjs/ustring.cpp (modified) (10 diffs)

trunk/JavaScriptCore/kjs/ustring.cpp

@@ -116 +116 @@
 UChar UChar::null;
 UString::Rep UString::Rep::null = { 0, 0, 0, 1 };
+UString::Rep UString::Rep::empty = { 0, 0, 0, 1 };
 UString UString::null;
 const int normalStatBufferSize = 4096;
@@ -191 +192 @@
   }
   int length = strlen(c);
+  if (length == 0) {
+    attach(&Rep::empty);
+    return;
+  }
   UChar *d = new UChar[length];
   for (int i = 0; i < length; i++)
@@ -199 +204 @@
 UString::UString(const UChar *c, int length)
 {
+  if (length == 0) {
+    attach(&Rep::empty);
+    return;
+  }
   UChar *d = new UChar[length];
   memcpy(d, c, length * sizeof(UChar));
@@ -206 +215 @@
 UString::UString(UChar *c, int length, bool copy)
 {
+  if (length == 0) {
+    attach(&Rep::empty);
+    return;
+  }
   UChar *d;
   if (copy) {
@@ -224 +237 @@
   int aSize = a.size();
   int bSize = b.size();
-  UChar *d = new UChar[aSize + bSize];
+  int length = aSize + bSize;
+  if (length == 0) {
+    attach(&Rep::empty);
+    return;
+  }
+  UChar *d = new UChar[length];
   memcpy(d, a.data(), aSize * sizeof(UChar));
   memcpy(d + aSize, b.data(), bSize * sizeof(UChar));
-  rep = Rep::create(d, aSize + bSize);
+  rep = Rep::create(d, length);
 }
 
@@ -467 +485 @@
 int UString::find(const UString &f, int pos) const
 {
-  if (isNull())
+  if (size() < f.size())
     return -1;
-  long fsize = f.size() * sizeof(UChar);
   if (pos < 0)
     pos = 0;
   const UChar *end = data() + size() - f.size();
+  long fsize = f.size() * sizeof(UChar);
+  const void *fdata = f.data();
   for (const UChar *c = data() + pos; c <= end; c++)
-    if (!memcmp((void*)c, (void*)f.data(), fsize))
+    if (!memcmp(c, fdata, fsize))
       return (c-data());
 
@@ -480 +499 @@
 }
 
+int UString::find(UChar ch, int pos) const
+{
+  if (pos < 0)
+    pos = 0;
+  const UChar *end = data() + size();
+  for (const UChar *c = data() + pos; c < end; c++)
+    if (*c == ch)
+      return (c-data());
+
+  return -1;
+}
+
 int UString::rfind(const UString &f, int pos) const
 {
-  if (isNull())
+  if (size() < f.size())
     return -1;
   if (pos + f.size() >= size())
     pos = size() - f.size();
   long fsize = f.size() * sizeof(UChar);
+  const void *fdata = f.data();
   for (const UChar *c = data() + pos; c >= data(); c--) {
-    if (!memcmp((void*)c, (void*)f.data(), fsize))
+    if (!memcmp(c, fdata, fsize))
       return (c-data());
   }
@@ -495 +527 @@
 }
 
+int UString::rfind(UChar ch, int pos) const
+{
+  if (isEmpty())
+    return -1;
+  if (pos + 1 >= size())
+    pos = size() - 1;
+  for (const UChar *c = data() + pos; c >= data(); c--) {
+    if (*c == ch)
+      return (c-data());
+  }
+
+  return -1;
+}
+
 UString UString::substr(int pos, int len) const
 {
-  if (isNull())
-    return UString();
   if (pos < 0)
     pos = 0;
@@ -552 +596 @@
 bool KJS::operator==(const UString& s1, const char *s2)
 {
-  if (s2 == 0L && s1.isNull())
-    return true;
-
-  if (s1.size() != (int) strlen(s2))
+  if (s2 == 0) {
+    return s1.isEmpty();
+  }
+
+  if (s1.size() != (int)strlen(s2))
     return false;
 
   const UChar *u = s1.data();
   while (*s2) {
-    if (u->uc != *s2 )
+    if (u->uc != (unsigned char)*s2)
       return false;
     s2++;
@@ -583 +628 @@
   }
   if (l < lmin)
-    return (c1->unicode() < c2->unicode());
+    return (c1->uc < c2->uc);
 
   return (l1 < l2);