Changeset 65177 in webkit for trunk/JavaScriptCore/runtime/JSString.h

Timestamp:

Aug 11, 2010, 12:52:41 PM (15 years ago)

Author:

[email protected]

Message:

Rubber stamps by Darin Adler & Sam Weinig.

Bug 43867 - Some UString cleanup

Change JSC::UString data(), size(), and from(), to characters(), length(), and number() to match WTF::String.
Move string concatenation methods to a new header to simplify down UString.h. Remove is8Bit().

JavaScriptCore:

• API/JSClassRef.cpp:

(OpaqueJSClass::~OpaqueJSClass):
(OpaqueJSClass::className):

• API/OpaqueJSString.cpp:

(OpaqueJSString::create):

• JavaScriptCore.exp:
• JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.def:
• JavaScriptCore.xcodeproj/project.pbxproj:
• bytecode/CodeBlock.cpp:

(JSC::constantName):
(JSC::idName):
(JSC::CodeBlock::registerName):
(JSC::regexpName):

• bytecode/EvalCodeCache.h:

(JSC::EvalCodeCache::get):

• bytecompiler/NodesCodegen.cpp:

(JSC::ResolveNode::emitBytecode):
(JSC::FunctionCallResolveNode::emitBytecode):
(JSC::ReadModifyResolveNode::emitBytecode):
(JSC::processClauseList):

• parser/ASTBuilder.h:

(JSC::ASTBuilder::createRegex):

• parser/ParserArena.h:

(JSC::IdentifierArena::makeNumericIdentifier):

• parser/SourceProvider.h:

(JSC::UStringSourceProvider::data):
(JSC::UStringSourceProvider::length):

• profiler/Profiler.cpp:
• runtime/Arguments.cpp:

(JSC::Arguments::getOwnPropertySlot):
(JSC::Arguments::getOwnPropertyNames):
(JSC::Arguments::put):
(JSC::Arguments::deleteProperty):

• runtime/ArrayPrototype.cpp:

(JSC::arrayProtoFuncToString):

• runtime/DatePrototype.cpp:

(JSC::formatLocaleDate):

• runtime/ExceptionHelpers.cpp:
• runtime/FunctionConstructor.cpp:
• runtime/FunctionPrototype.cpp:

(JSC::insertSemicolonIfNeeded):

• runtime/Identifier.h:

(JSC::Identifier::characters):
(JSC::Identifier::length):

• runtime/JSGlobalObjectFunctions.cpp:

(JSC::decode):
(JSC::parseInt):
(JSC::parseFloat):
(JSC::globalFuncEscape):
(JSC::globalFuncUnescape):

• runtime/JSNumberCell.cpp:

(JSC::JSNumberCell::toString):

• runtime/JSONObject.cpp:

(JSC::gap):
(JSC::Stringifier::appendQuotedString):
(JSC::Stringifier::appendStringifiedValue):
(JSC::Stringifier::indent):
(JSC::Stringifier::unindent):
(JSC::Walker::walk):

• runtime/JSString.cpp:

(JSC::JSString::replaceCharacter):
(JSC::JSString::getIndexSlowCase):

• runtime/JSString.h:

(JSC::RopeBuilder::JSString):
(JSC::RopeBuilder::appendValueInConstructAndIncrementLength):
(JSC::RopeBuilder::fiberCount):
(JSC::jsSingleCharacterSubstring):
(JSC::jsNontrivialString):
(JSC::JSString::getIndex):
(JSC::jsString):
(JSC::jsStringWithFinalizer):
(JSC::jsSubstring):
(JSC::jsOwnedString):

• runtime/JSStringBuilder.h:

(JSC::JSStringBuilder::append):

• runtime/LiteralParser.h:

(JSC::LiteralParser::Lexer::Lexer):

• runtime/NumberPrototype.cpp:

(JSC::numberProtoFuncToString):
(JSC::numberProtoFuncToFixed):
(JSC::numberProtoFuncToExponential):
(JSC::numberProtoFuncToPrecision):

• runtime/NumericStrings.h:

(JSC::NumericStrings::add):
(JSC::NumericStrings::lookupSmallString):

• runtime/Operations.h:

(JSC::jsString):

• runtime/RegExp.cpp:

(JSC::RegExp::match):

• runtime/RegExpCache.cpp:

(JSC::RegExpCache::lookupOrCreate):
(JSC::RegExpCache::create):

• runtime/RegExpConstructor.cpp:

(JSC::RegExpConstructor::getRightContext):

• runtime/RegExpObject.cpp:

(JSC::RegExpObject::match):

• runtime/RegExpPrototype.cpp:

(JSC::regExpProtoFuncToString):

• runtime/StringBuilder.h:

(JSC::StringBuilder::append):

• runtime/StringConcatenate.h: Copied from JavaScriptCore/runtime/UString.h.

(JSC::):
(JSC::sumWithOverflow):
(JSC::tryMakeString):
(JSC::makeString):

• runtime/StringObject.cpp:

(JSC::StringObject::getOwnPropertyNames):

• runtime/StringPrototype.cpp:

(JSC::substituteBackreferencesSlow):
(JSC::localeCompare):
(JSC::jsSpliceSubstringsWithSeparators):
(JSC::stringProtoFuncReplace):
(JSC::stringProtoFuncCharAt):
(JSC::stringProtoFuncCharCodeAt):
(JSC::stringProtoFuncIndexOf):
(JSC::stringProtoFuncLastIndexOf):
(JSC::stringProtoFuncSlice):
(JSC::stringProtoFuncSplit):
(JSC::stringProtoFuncSubstr):
(JSC::stringProtoFuncSubstring):
(JSC::stringProtoFuncToLowerCase):
(JSC::stringProtoFuncToUpperCase):
(JSC::stringProtoFuncFontsize):
(JSC::stringProtoFuncLink):
(JSC::trimString):

• runtime/UString.cpp:

(JSC::UString::number):
(JSC::UString::ascii):
(JSC::UString::operator[]):
(JSC::UString::toDouble):
(JSC::UString::find):
(JSC::UString::rfind):
(JSC::UString::substr):
(JSC::operator==):
(JSC::operator<):
(JSC::operator>):
(JSC::UString::UTF8String):

• runtime/UString.h:

(JSC::UString::UString):
(JSC::UString::adopt):
(JSC::UString::length):
(JSC::UString::characters):
(JSC::UString::isNull):
(JSC::UString::isEmpty):
(JSC::UString::impl):
(JSC::UString::cost):
(JSC::operator==):
(JSC::operator!=):
(JSC::codePointCompare):
(JSC::UString::toArrayIndex):
(JSC::IdentifierRepHash::hash):
(WTF::):

• yarr/RegexJIT.cpp:

(JSC::Yarr::jitCompileRegex):

• yarr/RegexParser.h:

(JSC::Yarr::Parser::Parser):

JavaScriptGlue:

• JSUtils.cpp:

(UStringToCFString):
(KJSValueToCFTypeInternal):

• JavaScriptGlue.xcodeproj/project.pbxproj:

WebCore:

• WebCore.xcodeproj/project.pbxproj:
• bindings/js/JSCSSStyleDeclarationCustom.cpp:

(WebCore::hasCSSPropertyNamePrefix):
(WebCore::cssPropertyName):

• bindings/js/JSLocationCustom.cpp:

(WebCore::JSLocation::setPort):

• bindings/js/ScriptDebugServer.cpp:

(WebCore::ScriptDebugServer::dispatchDidParseSource):

• bindings/js/ScriptString.h:

(WebCore::ScriptString::size):

• bindings/js/ScriptValue.cpp:

(WebCore::jsToInspectorValue):

• bindings/objc/WebScriptObject.mm:

(+[WebScriptObject _convertValueToObjcValue:originRootObject:rootObject:]):

• bridge/jni/jni_jsobject.mm:

(JavaJSObject::convertValueToJObject):

• bridge/jni/jsc/JNIUtilityPrivate.cpp:

(JSC::Bindings::convertArrayInstanceToJavaArray):
(JSC::Bindings::convertValueToJValue):

• bridge/objc/objc_runtime.mm:

(JSC::Bindings::callObjCFallbackObject):

WebKit/mac:

• WebView/WebScriptDebugger.mm:

(toNSString):

File:

• trunk/JavaScriptCore/runtime/JSString.h (modified) (17 diffs)

trunk/JavaScriptCore/runtime/JSString.h

@@ -187 +187 @@
         ALWAYS_INLINE JSString(JSGlobalData* globalData, const UString& value)
             : JSCell(globalData->stringStructure.get())
-            , m_length(value.size())
+            , m_length(value.length())
             , m_value(value)
             , m_fiberCount(0)
@@ -198 +198 @@
         JSString(JSGlobalData* globalData, const UString& value, HasOtherOwnerType)
             : JSCell(globalData->stringStructure.get())
-            , m_length(value.size())
+            , m_length(value.length())
             , m_value(value)
             , m_fiberCount(0)
@@ -236 +236 @@
         JSString(JSGlobalData* globalData, unsigned fiberCount, JSString* s1, const UString& u2)
             : JSCell(globalData->stringStructure.get())
-            , m_length(s1->length() + u2.size())
+            , m_length(s1->length() + u2.length())
             , m_fiberCount(fiberCount)
         {
@@ -249 +249 @@
         JSString(JSGlobalData* globalData, unsigned fiberCount, const UString& u1, JSString* s2)
             : JSCell(globalData->stringStructure.get())
-            , m_length(u1.size() + s2->length())
+            , m_length(u1.length() + s2->length())
             , m_fiberCount(fiberCount)
         {
@@ -277 +277 @@
         JSString(JSGlobalData* globalData, const UString& u1, const UString& u2)
             : JSCell(globalData->stringStructure.get())
-            , m_length(u1.size() + u2.size())
+            , m_length(u1.length() + u2.length())
             , m_fiberCount(2)
         {
@@ -289 +289 @@
         JSString(JSGlobalData* globalData, const UString& u1, const UString& u2, const UString& u3)
             : JSCell(globalData->stringStructure.get())
-            , m_length(u1.size() + u2.size() + u3.size())
+            , m_length(u1.length() + u2.length() + u3.length())
             , m_fiberCount(s_maxInternalRopeLength)
         {
@@ -301 +301 @@
         JSString(JSGlobalData* globalData, const UString& value, JSStringFinalizerCallback finalizer, void* context)
             : JSCell(globalData->stringStructure.get())
-            , m_length(value.size())
+            , m_length(value.length())
             , m_value(value)
             , m_fiberCount(0)
@@ -382 +382 @@
                 ASSERT(asCell(v)->isString());
                 JSString* s = static_cast<JSString*>(asCell(v));
-                ASSERT(s->size() == 1);
+                ASSERT(s->fiberCount() == 1);
                 appendStringInConstruct(index, s);
                 m_length += s->length();
@@ -390 +390 @@
                 impl->ref();
                 m_other.m_fibers[index++] = impl;
-                m_length += u.size();
+                m_length += u.length();
             }
         }
@@ -428 +428 @@
         bool isRope() const { return m_fiberCount; }
         UString& string() { ASSERT(!isRope()); return m_value; }
-        unsigned size() { return m_fiberCount ? m_fiberCount : 1; }
+        unsigned fiberCount() { return m_fiberCount ? m_fiberCount : 1; }
 
         friend JSValue jsString(ExecState* exec, JSString* s1, JSString* s2);
@@ -471 +471 @@
     {
         JSGlobalData* globalData = &exec->globalData();
-        ASSERT(offset < static_cast<unsigned>(s.size()));
-        UChar c = s.data()[offset];
+        ASSERT(offset < static_cast<unsigned>(s.length()));
+        UChar c = s.characters()[offset];
         if (c <= 0xFF)
             return globalData->smallStrings.singleCharacterString(globalData, c);
@@ -488 +488 @@
     inline JSString* jsNontrivialString(JSGlobalData* globalData, const UString& s)
     {
-        ASSERT(s.size() > 1);
+        ASSERT(s.length() > 1);
         return fixupVPtr(globalData, new (globalData) JSString(globalData, s));
     }
@@ -497 +497 @@
         if (isRope())
             return getIndexSlowCase(exec, i);
-        ASSERT(i < m_value.size());
+        ASSERT(i < m_value.length());
         return jsSingleCharacterSubstring(exec, m_value, i);
     }
@@ -503 +503 @@
     inline JSString* jsString(JSGlobalData* globalData, const UString& s)
     {
-        int size = s.size();
+        int size = s.length();
         if (!size)
             return globalData->smallStrings.emptyString(globalData);
         if (size == 1) {
-            UChar c = s.data()[0];
+            UChar c = s.characters()[0];
             if (c <= 0xFF)
                 return globalData->smallStrings.singleCharacterString(globalData, c);
@@ -516 +516 @@
     inline JSString* jsStringWithFinalizer(ExecState* exec, const UString& s, JSStringFinalizerCallback callback, void* context)
     {
-        ASSERT(s.size() && (s.size() > 1 || s.data()[0] > 0xFF));
+        ASSERT(s.length() && (s.length() > 1 || s.characters()[0] > 0xFF));
         JSGlobalData* globalData = &exec->globalData();
         return fixupVPtr(globalData, new (globalData) JSString(globalData, s, callback, context));
@@ -523 +523 @@
     inline JSString* jsSubstring(JSGlobalData* globalData, const UString& s, unsigned offset, unsigned length)
     {
-        ASSERT(offset <= static_cast<unsigned>(s.size()));
-        ASSERT(length <= static_cast<unsigned>(s.size()));
-        ASSERT(offset + length <= static_cast<unsigned>(s.size()));
+        ASSERT(offset <= static_cast<unsigned>(s.length()));
+        ASSERT(length <= static_cast<unsigned>(s.length()));
+        ASSERT(offset + length <= static_cast<unsigned>(s.length()));
         if (!length)
             return globalData->smallStrings.emptyString(globalData);
         if (length == 1) {
-            UChar c = s.data()[offset];
+            UChar c = s.characters()[offset];
             if (c <= 0xFF)
                 return globalData->smallStrings.singleCharacterString(globalData, c);
@@ -538 +538 @@
     inline JSString* jsOwnedString(JSGlobalData* globalData, const UString& s)
     {
-        int size = s.size();
+        int size = s.length();
         if (!size)
             return globalData->smallStrings.emptyString(globalData);
         if (size == 1) {
-            UChar c = s.data()[0];
+            UChar c = s.characters()[0];
             if (c <= 0xFF)
                 return globalData->smallStrings.singleCharacterString(globalData, c);