Changeset 52346 in webkit for trunk/JavaScriptCore/runtime/Identifier.cpp

Timestamp:

Dec 18, 2009, 2:59:18 PM (15 years ago)

Author:

[email protected]

Message:

Add createNonCopying method to UString to make replace constructor passed bool,
to make behaviour more explicit. Add createFromUTF8 to UString (wrapping method
on UString::Rep), since other cases of transliteration (e.g. from ascii) are
performed in UString constructors. Add/use setHash & size() accessors on Rep,
rather than accessing _hash/len directly.

Reviewed by Sam Weinig.

• API/JSClassRef.cpp:

(OpaqueJSClass::OpaqueJSClass):

• API/OpaqueJSString.cpp:

(OpaqueJSString::ustring):

• JavaScriptCore.exp:
• runtime/ArrayPrototype.cpp:

(JSC::arrayProtoFuncToString):

• runtime/Identifier.cpp:

(JSC::Identifier::equal):
(JSC::CStringTranslator::translate):
(JSC::UCharBufferTranslator::translate):
(JSC::Identifier::addSlowCase):

• runtime/JSString.cpp:

(JSC::JSString::resolveRope):

• runtime/JSString.h:

(JSC::JSString::Rope::Fiber::refAndGetLength):
(JSC::JSString::Rope::append):

• runtime/StringBuilder.h:

(JSC::StringBuilder::release):

• runtime/StringConstructor.cpp:

(JSC::stringFromCharCodeSlowCase):

• runtime/StringPrototype.cpp:

(JSC::substituteBackreferencesSlow):
(JSC::stringProtoFuncToLowerCase):
(JSC::stringProtoFuncToUpperCase):
(JSC::stringProtoFuncFontsize):
(JSC::stringProtoFuncLink):

• runtime/UString.cpp:

(JSC::UString::UString):
(JSC::UString::createNonCopying):
(JSC::UString::createFromUTF8):

• runtime/UString.h:

(JSC::UString::Rep::setHash):
(JSC::UString::~UString):
(JSC::makeString):

File:

• trunk/JavaScriptCore/runtime/Identifier.cpp (modified) (6 diffs)

trunk/JavaScriptCore/runtime/Identifier.cpp

@@ -78 +78 @@
 bool Identifier::equal(const UString::Rep* r, const char* s)
 {
-    int length = r->len;
+    int length = r->size();
     const UChar* d = r->data();
     for (int i = 0; i != length; ++i)
@@ -88 +88 @@
 bool Identifier::equal(const UString::Rep* r, const UChar* s, int length)
 {
-    if (r->len != length)
+    if (r->size() != length)
         return false;
     const UChar* d = r->data();
@@ -116 +116 @@
         
         UString::Rep* r = UString::Rep::create(d, static_cast<int>(length)).releaseRef();
-        r->_hash = hash;
+        r->setHash(hash);
 
         location = r;
@@ -181 +181 @@
         
         UString::Rep* r = UString::Rep::create(d, buf.length).releaseRef();
-        r->_hash = hash;
+        r->setHash(hash);
         
         location = r; 
@@ -214 +214 @@
 {
     ASSERT(!r->identifierTable());
-    if (r->len == 1) {
+    if (r->size() == 1) {
         UChar c = r->data()[0];
         if (c <= 0xFF)
@@ -225 +225 @@
             }
     }
-    if (!r->len) {
+    if (!r->size()) {
         UString::Rep::empty().hash();
         return &UString::Rep::empty();