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

Timestamp:

Apr 21, 2010, 12:13:50 PM (15 years ago)

Author:

[email protected]

Message:

JavaScriptCore: Bug 37906 - Remove JSC::UStringImpl; unify with StringImpl.

Reviewed by Oliver Hunt, Darin Adler.

JSC::UStringImpl and WebCore::StringImpl (soon to be renamed to
WTF::StringImpl) are almost identical. Remove duplication of code by unifying
the two, move missing features from UStringImpl into StringImpl & delete the
class UStringImpl.

• API/JSClassRef.cpp:
• API/JSContextRef.cpp:
• GNUmakefile.am:
• JavaScriptCore.exp:
• JavaScriptCore.pro:
• JavaScriptCore.xcodeproj/project.pbxproj:
• bytecode/EvalCodeCache.h:
• bytecode/JumpTable.cpp:
• profiler/ProfileNode.cpp:
• runtime/Identifier.cpp:

(JSC::Identifier::add):

• runtime/Identifier.h:

(JSC::Identifier::equal):

• runtime/UString.cpp:
• runtime/UString.h:

(WTF::):

• runtime/UStringImpl.cpp: Removed.
• runtime/UStringImpl.h:
• wtf/text/StringHash.h:

(WebCore::StringHash::equal):
(WebCore::CaseFoldingHash::equal):

• wtf/text/StringImpl.cpp:

(WebCore::StringImpl::~StringImpl):
(WebCore::StringImpl::empty):
(WebCore::StringImpl::sharedBuffer):
(WebCore::equal):

• wtf/text/StringImpl.h:

(WebCore::StringImpl::StringImpl):
(WebCore::StringImpl::create):
(WebCore::StringImpl::tryCreateUninitialized):
(WebCore::StringImpl::cost):
(WebCore::StringImpl::isIdentifier):
(WebCore::StringImpl::setIsIdentifier):
(WebCore::StringImpl::computeHash):
(WebCore::StringImpl::copyChars):
(WebCore::StringImpl::):

JavaScriptGlue: Bug 37906 - Remove JSC::UStringImpl; unify with StringImpl.
Add forwarding header.

Reviewed by Oliver Hunt, Darin Adler.

• ForwardingHeaders/wtf/ASCIICType.h: Added.
• ForwardingHeaders/wtf/text/StringImpl.h: Added.

WebCore: Bug 37906 - Remove JSC::UStringImpl; unify with StringImpl.
Add include for StringHash.h.

Reviewed by Oliver Hunt, Darin Adler.

• WebCore.xcodeproj/project.pbxproj:
• bridge/c/c_class.cpp:

File:

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

trunk/JavaScriptCore/runtime/Identifier.cpp

@@ -30 +30 @@
 #include <wtf/HashSet.h>
 #include <wtf/WTFThreadData.h>
+#include <wtf/text/StringHash.h>
 
 using WTF::ThreadSpecific;
@@ -101 +102 @@
 }
 
-struct CStringTranslator {
+struct IdentifierCStringTranslator {
     static unsigned hash(const char* c)
     {
@@ -140 +141 @@
         return iter->second;
 
-    pair<HashSet<UString::Rep*>::iterator, bool> addResult = identifierTable.add<const char*, CStringTranslator>(c);
+    pair<HashSet<UString::Rep*>::iterator, bool> addResult = identifierTable.add<const char*, IdentifierCStringTranslator>(c);
 
     // If the string is newly-translated, then we need to adopt it.
@@ -161 +162 @@
 };
 
-struct UCharBufferTranslator {
+struct IdentifierUCharBufferTranslator {
     static unsigned hash(const UCharBuffer& buf)
     {
@@ -193 +194 @@
         return UString::Rep::empty();
     UCharBuffer buf = {s, length}; 
-    pair<HashSet<UString::Rep*>::iterator, bool> addResult = globalData->identifierTable->add<UCharBuffer, UCharBufferTranslator>(buf);
+    pair<HashSet<UString::Rep*>::iterator, bool> addResult = globalData->identifierTable->add<UCharBuffer, IdentifierUCharBufferTranslator>(buf);
 
     // If the string is newly-translated, then we need to adopt it.