Changeset 56560 in webkit for trunk/JavaScriptCore/runtime

Timestamp:

Mar 25, 2010, 11:20:17 AM (15 years ago)

Author:

[email protected]

Message:

Bug 36611 - Cleanup JSC::CString
Rename CString::c_str() -> CString::data(), CString::size() -> CString::length(),
remove UString::getCString() (all uses are wrong, should use UString::UTF8String()).

Reviewed by Geoff Garen.

JavaScriptCore:

• bytecode/CodeBlock.cpp:

(JSC::CodeBlock::printUnaryOp):
(JSC::CodeBlock::printBinaryOp):
(JSC::CodeBlock::printConditionalJump):
(JSC::CodeBlock::printGetByIdOp):
(JSC::CodeBlock::printPutByIdOp):
(JSC::printGlobalResolveInfo):
(JSC::printStructureStubInfo):
(JSC::CodeBlock::printStructure):
(JSC::CodeBlock::printStructures):
(JSC::CodeBlock::dump):

• jsc.cpp:

(functionPrint):
(functionDebug):
(runInteractive):
(fillBufferWithContentsOfFile):

• profiler/CallIdentifier.h:

(JSC::CallIdentifier::c_str):

• profiler/Profile.cpp:

(JSC::Profile::debugPrintDataSampleStyle):

• profiler/ProfileNode.cpp:

(JSC::ProfileNode::debugPrintData):
(JSC::ProfileNode::debugPrintDataSampleStyle):

• runtime/DateConversion.cpp:

(JSC::parseDate):

• runtime/JSGlobalObjectFunctions.cpp:

(JSC::encode):
(JSC::globalFuncJSCPrint):

• runtime/UString.cpp:

(JSC::operator==):
(JSC::UString::toDouble):

• runtime/UString.h:

(JSC::CString::length):
(JSC::CString::data):

WebCore:

• bridge/NP_jsobject.cpp:

(_NPN_Enumerate):

• bridge/c/c_utility.cpp:

(JSC::Bindings::convertValueToNPVariant):

• bridge/jni/jsc/JNIBridgeJSC.cpp:

(JavaField::valueFromInstance):
(JavaField::setValueToInstance):

• bridge/jni/jsc/JavaInstanceJSC.cpp:

(JavaInstance::invokeMethod):

• bridge/jni/jsc/JavaStringJSC.h:

(JSC::Bindings::JavaStringImpl::UTF8String):

Location:

trunk/JavaScriptCore/runtime

Files:

• DateConversion.cpp (modified) (1 diff)
• JSGlobalObjectFunctions.cpp (modified) (2 diffs)
• UString.cpp (modified) (3 diffs)
• UString.h (modified) (2 diffs)

trunk/JavaScriptCore/runtime/DateConversion.cpp

@@ -57 +57 @@
     if (date == exec->globalData().cachedDateString)
         return exec->globalData().cachedDateStringValue;
-    double value = parseDateFromNullTerminatedCharacters(exec, date.UTF8String().c_str());
+    double value = parseDateFromNullTerminatedCharacters(exec, date.UTF8String().data());
     exec->globalData().cachedDateString = date;
     exec->globalData().cachedDateStringValue = value;

trunk/JavaScriptCore/runtime/JSGlobalObjectFunctions.cpp

@@ -56 +56 @@
     UString str = args.at(0).toString(exec);
     CString cstr = str.UTF8String(true);
-    if (!cstr.c_str())
+    if (!cstr.data())
         return throwError(exec, URIError, "String contained an illegal UTF-16 sequence.");
 
     JSStringBuilder builder;
-    const char* p = cstr.c_str();
-    for (size_t k = 0; k < cstr.size(); k++, p++) {
+    const char* p = cstr.data();
+    for (size_t k = 0; k < cstr.length(); k++, p++) {
         char c = *p;
         if (c && strchr(doNotEscape, c))
@@ -431 +431 @@
 JSValue JSC_HOST_CALL globalFuncJSCPrint(ExecState* exec, JSObject*, JSValue, const ArgList& args)
 {
-    CStringBuffer string;
-    args.at(0).toString(exec).getCString(string);
+    CString string = args.at(0).toString(exec).UTF8String();
     puts(string.data());
     return jsUndefined();

trunk/JavaScriptCore/runtime/UString.cpp

@@ -143 +143 @@
 bool operator==(const CString& c1, const CString& c2)
 {
-    size_t len = c1.size();
-    return len == c2.size() && (len == 0 || memcmp(c1.c_str(), c2.c_str(), len) == 0);
+    size_t len = c1.length();
+    return len == c2.length() && (len == 0 || memcmp(c1.data(), c2.data(), len) == 0);
 }
 
@@ -293 +293 @@
 }
 
-bool UString::getCString(CStringBuffer& buffer) const
-{
-    unsigned length = size();
-    unsigned neededSize = length + 1;
-    buffer.resize(neededSize);
-    char* buf = buffer.data();
-
-    UChar ored = 0;
-    const UChar* p = data();
-    char* q = buf;
-    const UChar* limit = p + length;
-    while (p != limit) {
-        UChar c = p[0];
-        ored |= c;
-        *q = static_cast<char>(c);
-        ++p;
-        ++q;
-    }
-    *q = '\0';
-
-    return !(ored & 0xFF00);
-}
-
 char* UString::ascii() const
 {
@@ -369 +346 @@
     }
 
-    // FIXME: If tolerateTrailingJunk is true, then we want to tolerate non-8-bit junk
-    // after the number, so this is too strict a check.
-    CStringBuffer s;
-    if (!getCString(s))
-        return NaN;
+    CString s = UTF8String();
     const char* c = s.data();
 

trunk/JavaScriptCore/runtime/UString.h

@@ -62 +62 @@
         CString& operator+=(const CString& c) { return append(c); }
 
-        size_t size() const { return m_length; }
-        const char* c_str() const { return m_data; }
+        size_t length() const { return m_length; }
+        const char* data() const { return m_data; }
 
     private:
@@ -113 +113 @@
         static UString from(long);
         static UString from(double);
-
-        bool getCString(CStringBuffer&) const;
 
         // NOTE: This method should only be used for *debugging* purposes as it