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

Timestamp:

Nov 19, 2002, 6:35:01 PM (23 years ago)

Author:

darin

Message:

• a few more globals for often-used property names
• conversion to Identifier from UString must now be explicit

• kjs/error_object.cpp:
• kjs/function.cpp:
• kjs/function_object.cpp:
• kjs/identifier.cpp:
• kjs/identifier.h:
• kjs/lexer.cpp:
• kjs/nodes.cpp:
• kjs/number_object.cpp:
• kjs/object.cpp:
• kjs/object.h:
• kjs/string_object.cpp:
• kjs/testkjs.cpp:
• kjs/ustring.cpp:
• kjs/ustring.h:

File:

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

trunk/JavaScriptCore/kjs/ustring.cpp

@@ -165 +165 @@
   r->rc = 1;
   r->_hash = 0;
-
   return r;
 }
@@ -172 +171 @@
 {
   if (capacity == capacityForIdentifier)
-    Identifier::aboutToDestroyUStringRep(this);
+    Identifier::remove(this);
   delete [] dat;
   delete this;
 }
 
-void UString::Rep::computeHash() const
-{
-    int length = len;
+unsigned UString::Rep::computeHash(const UChar *s, int length)
+{
     int prefixLength = length < 8 ? length : 8;
     int suffixPosition = length < 16 ? 8 : length - 8;
@@ -185 +183 @@
     unsigned h = length;
     for (int i = 0; i < prefixLength; i++)
-        h = 127 * h + dat[i].unicode();
+        h = 127 * h + s[i].unicode();
     for (int i = suffixPosition; i < length; i++)
-        h = 127 * h + dat[i].unicode();
+        h = 127 * h + s[i].unicode();
     if (h == 0)
         h = 0x80000000;
-    _hash = h;
+    return h;
+}
+
+unsigned UString::Rep::computeHash(const char *s)
+{
+    int length = strlen(s);
+    int prefixLength = length < 8 ? length : 8;
+    int suffixPosition = length < 16 ? 8 : length - 8;
+
+    unsigned h = length;
+    for (int i = 0; i < prefixLength; i++)
+        h = 127 * h + (unsigned char)s[i];
+    for (int i = suffixPosition; i < length; i++)
+        h = 127 * h + (unsigned char)s[i];
+    if (h == 0)
+        h = 0x80000000;
+    return h;
 }
 
@@ -247 +261 @@
     d = c;
   rep = Rep::create(d, length);
-}
-
-UString::UString(const UString &b)
-{
-  attach(b.rep);
 }