Changeset 65344 in webkit for trunk/JavaScriptCore/runtime

Timestamp:

Aug 13, 2010, 6:28:27 PM (15 years ago)

Author:

[email protected]

Message:

Switch String::/UString::ascii() to return a CString.

Rubber stamped by Sam Weinig.

JavaScriptCore:

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

(JSC::CodeBlock::dump):

• bytecode/SamplingTool.cpp:

(JSC::SamplingTool::dump):

• interpreter/CallFrame.cpp:

(JSC::CallFrame::dumpCaller):

• jsc.cpp:

(runWithScripts):
(runInteractive):

• runtime/Identifier.h:

(JSC::Identifier::ascii):

• runtime/ScopeChain.cpp:

(JSC::ScopeChainNode::print):

• runtime/UString.cpp:

(JSC::UString::ascii):
(JSC::UString::latin1):

• runtime/UString.h:
• wtf/text/StringImpl.cpp:

(WTF::StringImpl::asciiOLD):

• wtf/text/StringImpl.h:
• wtf/text/WTFString.cpp:

(WTF::String::ascii):
(WTF::String::latin1):

• wtf/text/WTFString.h:

WebCore:

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

(JSC::Bindings::CClass::methodsNamed):
(JSC::Bindings::CClass::fieldNamed):

• bridge/jni/jsc/JNIBridgeJSC.cpp:

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

• bridge/jni/jsc/JavaInstanceJSC.cpp:

(JavaInstance::invokeMethod):

• bridge/objc/objc_class.mm:

(JSC::Bindings::ObjcClass::methodsNamed):
(JSC::Bindings::ObjcClass::fieldNamed):

• bridge/objc/objc_instance.mm:

(ObjcInstance::setValueOfUndefinedField):
(ObjcInstance::getValueOfUndefinedField):

• loader/icon/IconRecord.cpp:
• platform/sql/SQLiteDatabase.cpp:
• platform/sql/SQLiteStatement.cpp:
• storage/SQLStatement.cpp:

WebKit:

• WebKit.xcodeproj/project.pbxproj:

WebKit/mac:

• Plugins/Hosted/ProxyInstance.mm:

(WebKit::ProxyInstance::methodsNamed):
(WebKit::ProxyInstance::fieldNamed):

Location:

trunk/JavaScriptCore/runtime

Files:

• Identifier.h (modified) (1 diff)
• ScopeChain.cpp (modified) (1 diff)
• UString.cpp (modified) (2 diffs)
• UString.h (modified) (2 diffs)

trunk/JavaScriptCore/runtime/Identifier.h

@@ -51 +51 @@
         int length() const { return m_string.length(); }
         
-        const char* ascii() const { return m_string.ascii(); }
+        CString ascii() const { return m_string.ascii(); }
         
         static Identifier from(ExecState* exec, unsigned y);

trunk/JavaScriptCore/runtime/ScopeChain.cpp

@@ -44 +44 @@
         for (PropertyNameArray::const_iterator propIter = propertyNames.begin(); propIter != propEnd; propIter++) {
             Identifier name = *propIter;
-            fprintf(stderr, "%s, ", name.ascii());
+            fprintf(stderr, "%s, ", name.ustring().utf8().data());
         }
         fprintf(stderr, "\n");

trunk/JavaScriptCore/runtime/UString.cpp

@@ -205 +205 @@
 }
 
-char* UString::ascii() const
-{
-    static char* asciiBuffer = 0;
-
-    unsigned len = length();
-    unsigned neededSize = len + 1;
-    delete[] asciiBuffer;
-    asciiBuffer = new char[neededSize];
-
-    const UChar* p = characters();
-    char* q = asciiBuffer;
-    const UChar* limit = p + len;
-    while (p != limit) {
-        *q = static_cast<char>(p[0]);
-        ++p;
-        ++q;
-    }
-    *q = '\0';
-
-    return asciiBuffer;
-}
-
 static inline bool isInfinity(double number)
 {
@@ -584 +562 @@
 }
 
+CString UString::ascii() const
+{
+    // Basic Latin1 (ISO) encoding - Unicode characters 0..255 are
+    // preserved, characters outside of this range are converted to '?'.
+
+    unsigned length = this->length();
+    const UChar* characters = this->characters();
+
+    char* characterBuffer;
+    CString result = CString::newUninitialized(length, characterBuffer);
+
+    for (unsigned i = 0; i < length; ++i) {
+        UChar ch = characters[i];
+        characterBuffer[i] = ch && (ch < 0x20 || ch >= 0x7f) ? '?' : ch;
+    }
+
+    return result;
+}
+
+CString UString::latin1() const
+{
+    // Basic Latin1 (ISO) encoding - Unicode characters 0..255 are
+    // preserved, characters outside of this range are converted to '?'.
+
+    unsigned length = this->length();
+    const UChar* characters = this->characters();
+
+    char* characterBuffer;
+    CString result = CString::newUninitialized(length, characterBuffer);
+
+    for (unsigned i = 0; i < length; ++i) {
+        UChar ch = characters[i];
+        characterBuffer[i] = ch > 0xff ? '?' : ch;
+    }
+
+    return result;
+}
+
 // Helper to write a three-byte UTF-8 code point to the buffer, caller must check room is available.
 static inline void putUTF8Triple(char*& buffer, UChar ch)

trunk/JavaScriptCore/runtime/UString.h

@@ -88 +88 @@
     }
 
+    CString ascii() const;
+    CString latin1() const;
     CString utf8(bool strict = false) const;
 
@@ -120 +122 @@
 
     UString substr(unsigned pos = 0, unsigned len = 0xFFFFFFFF) const;
-
-    // NOTE: This method should only be used for *debugging* purposes as it
-    // is neither Unicode safe nor free from side effects nor thread-safe.
-    char* ascii() const;
 
 private: