Changeset 127958 in webkit for trunk/Source/JavaScriptCore/runtime

Timestamp:

Sep 7, 2012, 10:46:29 PM (13 years ago)

Author:

[email protected]

Message:

Rename the ustring() accessor to string()
​https://bugs.webkit.org/show_bug.cgi?id=95919

Patch by Benjamin Poulain <​[email protected]> on 2012-09-07
Reviewed by Geoffrey Garen.

Source/JavaScriptCore:

Rename ustring() to string() to make the accessor name more logical after
r127191.

• API/JSBase.cpp:

(JSEvaluateScript):
(JSCheckScriptSyntax):

• API/JSObjectRef.cpp:

(JSObjectMakeFunctionWithCallback):
(JSObjectMakeFunction):
(JSObjectCopyPropertyNames):

• API/JSProfilerPrivate.cpp:

(JSStartProfiling):
(JSEndProfiling):

• API/JSValueRef.cpp:

(JSValueMakeString):
(JSValueMakeFromJSONString):

• API/OpaqueJSString.cpp:

(OpaqueJSString::string):

• API/OpaqueJSString.h:

(OpaqueJSString):

• bytecode/CodeBlock.cpp:

(JSC::idName):
(JSC::CodeBlock::dump):

• bytecompiler/BytecodeGenerator.cpp:

(JSC::BytecodeGenerator::emitLoad):
(JSC::BytecodeGenerator::addStringConstant):

• bytecompiler/NodesCodegen.cpp:

(JSC::RegExpNode::emitBytecode):
(JSC::processClauseList):

• dfg/DFGGraph.cpp:

(JSC::DFG::Graph::dump):

• interpreter/Interpreter.cpp:

(JSC::Interpreter::privateExecute):

• jit/JITStubs.cpp:

(JSC::DEFINE_STUB_FUNCTION):

• jsc.cpp:

(GlobalObject::addFunction):
(GlobalObject::addConstructableFunction):

• llint/LLIntSlowPaths.cpp:

(JSC::LLInt::LLINT_SLOW_PATH_DECL):

• parser/ASTBuilder.h:

(JSC::ASTBuilder::createRegExp):

• parser/Parser.cpp:

(JSC::::parsePrimaryExpression):

• parser/Parser.h:

(JSC::Scope::declareVariable):
(JSC::Scope::declareParameter):
(JSC::Scope::useVariable):

• parser/SyntaxChecker.h:

(JSC::SyntaxChecker::createRegExp):

• runtime/ExceptionHelpers.cpp:

(JSC::createUndefinedVariableError):

• runtime/Executable.cpp:

(JSC::FunctionExecutable::paramString):

• runtime/Executable.h:

(JSC::FunctionExecutable::finishCreation):

• runtime/FunctionPrototype.cpp:

(JSC::FunctionPrototype::addFunctionProperties):

• runtime/Identifier.h:

(JSC::Identifier::string):

• runtime/JSFunction.cpp:

(JSC::JSFunction::calculatedDisplayName):

• runtime/JSGlobalObject.cpp:

(JSC::JSGlobalObject::reset):

• runtime/JSONObject.cpp:

(JSC::PropertyNameForFunctionCall::value):
(JSC::Stringifier::Holder::appendNextProperty):
(JSC::Walker::walk):

• runtime/JSPropertyNameIterator.h:

(JSC::JSPropertyNameIterator::finishCreation):

• runtime/JSScope.cpp:

(JSC::JSScope::resolveBase):

• runtime/JSString.h:

(JSC::inlineJSValueNotStringtoString):

• runtime/LiteralParser.cpp:

(JSC::::parse):

• runtime/ObjectConstructor.cpp:

(JSC::ObjectConstructor::finishCreation):
(JSC::objectConstructorGetOwnPropertyNames):
(JSC::objectConstructorKeys):

• runtime/RegExpConstructor.cpp:

(JSC::RegExpConstructor::finishCreation):

Source/WebCore:

• bindings/js/Dictionary.cpp:

(WebCore::Dictionary::getOwnPropertiesAsStringHashMap):
(WebCore::Dictionary::getOwnPropertyNames):

• bindings/js/SerializedScriptValue.cpp:

Simplify a few String constructions which were still using type conversion
through StringImpl.

(WebCore::CloneSerializer::write):
(WebCore::CloneDeserializer::CachedString::string):
(WebCore::CloneDeserializer::readFile):
(WebCore::CloneDeserializer::readTerminal):
(WebCore::CloneDeserializer::deserialize):

• bridge/NP_jsobject.cpp:

(_NPN_Enumerate):

Source/WebKit/efl:

• WebCoreSupport/DumpRenderTreeSupportEfl.cpp:

(DumpRenderTreeSupportEfl::sendWebIntentResponse):
(DumpRenderTreeSupportEfl::deliverWebIntent):
Aslo update the code from the UString->String conversion through StringImpl.

Source/WebKit/mac:

• Plugins/Hosted/NetscapePluginInstanceProxy.mm:

(WebKit::NetscapePluginInstanceProxy::enumerate):

Source/WebKit2:

• WebProcess/Plugins/Netscape/NPJSObject.cpp:

(WebKit::NPJSObject::enumerate):

Tools:

Update EFL's DRT.

Fix some string conversion that have been made useless
with recent changes.

• DumpRenderTree/efl/EventSender.cpp:

(keyPadNameFromJSValue):
(keyNameFromJSValue):

• DumpRenderTree/efl/TestRunnerEfl.cpp:

(TestRunner::queueLoad):
(TestRunner::addOriginAccessWhitelistEntry):
(TestRunner::removeOriginAccessWhitelistEntry):
(TestRunner::setUserStyleSheetLocation):
(TestRunner::setValueForUser):
(TestRunner::elementDoesAutoCompleteForElementWithId):
(TestRunner::execCommand):
(TestRunner::findString):
(TestRunner::isCommandEnabled):
(TestRunner::clearApplicationCacheForOrigin):
(TestRunner::setDomainRelaxationForbiddenForURLScheme):
(TestRunner::pauseAnimationAtTimeOnElementWithId):
(TestRunner::pauseTransitionAtTimeOnElementWithId):
(toInt):
(TestRunner::overridePreference):
(TestRunner::addUserScript):
(TestRunner::addUserStyleSheet):
(TestRunner::evaluateInWebInspector):
(TestRunner::evaluateScriptInIsolatedWorld):
(TestRunner::setTextDirection):

• DumpRenderTree/efl/WorkQueueItemEfl.cpp:

(LoadItem::invoke):
(LoadHTMLStringItem::invoke):
(ScriptItem::invoke):

Location:

trunk/Source/JavaScriptCore/runtime

Files:

• ExceptionHelpers.cpp (modified) (1 diff)
• Executable.cpp (modified) (2 diffs)
• Executable.h (modified) (1 diff)
• FunctionPrototype.cpp (modified) (1 diff)
• Identifier.h (modified) (1 diff)
• JSFunction.cpp (modified) (1 diff)
• JSGlobalObject.cpp (modified) (1 diff)
• JSONObject.cpp (modified) (3 diffs)
• JSPropertyNameIterator.h (modified) (1 diff)
• JSScope.cpp (modified) (1 diff)
• JSString.h (modified) (1 diff)
• LiteralParser.cpp (modified) (1 diff)
• ObjectConstructor.cpp (modified) (3 diffs)
• RegExpConstructor.cpp (modified) (1 diff)

trunk/Source/JavaScriptCore/runtime/ExceptionHelpers.cpp

@@ -107 +107 @@
 JSObject* createUndefinedVariableError(ExecState* exec, const Identifier& ident)
 {
-    String message(makeString("Can't find variable: ", ident.ustring()));
+    String message(makeString("Can't find variable: ", ident.string()));
     return createReferenceError(exec, message);
 }

trunk/Source/JavaScriptCore/runtime/Executable.cpp

@@ -673 +673 @@
 
     FunctionExecutable* functionExecutable = FunctionExecutable::create(exec->globalData(), body);
-    functionExecutable->m_nameValue.set(exec->globalData(), functionExecutable, jsString(&exec->globalData(), name.ustring()));
+    functionExecutable->m_nameValue.set(exec->globalData(), functionExecutable, jsString(&exec->globalData(), name.string()));
     return functionExecutable;
 }
@@ -684 +684 @@
         if (!builder.isEmpty())
             builder.appendLiteral(", ");
-        builder.append(parameters[pos].ustring());
+        builder.append(parameters[pos].string());
     }
     return builder.toString();

trunk/Source/JavaScriptCore/runtime/Executable.h

@@ -713 +713 @@
         {
             Base::finishCreation(globalData);
-            m_nameValue.set(globalData, this, jsString(&globalData, name().ustring()));
+            m_nameValue.set(globalData, this, jsString(&globalData, name().string()));
         }
 

trunk/Source/JavaScriptCore/runtime/FunctionPrototype.cpp

@@ -56 +56 @@
 void FunctionPrototype::addFunctionProperties(ExecState* exec, JSGlobalObject* globalObject, JSFunction** callFunction, JSFunction** applyFunction)
 {
-    JSFunction* toStringFunction = JSFunction::create(exec, globalObject, 0, exec->propertyNames().toString.ustring(), functionProtoFuncToString);
+    JSFunction* toStringFunction = JSFunction::create(exec, globalObject, 0, exec->propertyNames().toString.string(), functionProtoFuncToString);
     putDirectWithoutTransition(exec->globalData(), exec->propertyNames().toString, toStringFunction, DontEnum);
 
-    *applyFunction = JSFunction::create(exec, globalObject, 2, exec->propertyNames().apply.ustring(), functionProtoFuncApply);
+    *applyFunction = JSFunction::create(exec, globalObject, 2, exec->propertyNames().apply.string(), functionProtoFuncApply);
     putDirectWithoutTransition(exec->globalData(), exec->propertyNames().apply, *applyFunction, DontEnum);
 
-    *callFunction = JSFunction::create(exec, globalObject, 1, exec->propertyNames().call.ustring(), functionProtoFuncCall);
+    *callFunction = JSFunction::create(exec, globalObject, 1, exec->propertyNames().call.string(), functionProtoFuncCall);
     putDirectWithoutTransition(exec->globalData(), exec->propertyNames().call, *callFunction, DontEnum);
 
-    JSFunction* bindFunction = JSFunction::create(exec, globalObject, 1, exec->propertyNames().bind.ustring(), functionProtoFuncBind);
+    JSFunction* bindFunction = JSFunction::create(exec, globalObject, 1, exec->propertyNames().bind.string(), functionProtoFuncBind);
     putDirectWithoutTransition(exec->globalData(), exec->propertyNames().bind, bindFunction, DontEnum);
 }

trunk/Source/JavaScriptCore/runtime/Identifier.h

@@ -53 +53 @@
         Identifier(JSGlobalData* globalData, const String& s) : m_string(add(globalData, s.impl())) { }
 
-        // FIXME: fix this name.
-        const String& ustring() const { return m_string; }
+        const String& string() const { return m_string; }
         StringImpl* impl() const { return m_string.impl(); }
         

trunk/Source/JavaScriptCore/runtime/JSFunction.cpp

@@ -151 +151 @@
         return actualName;
     
-    return jsExecutable()->inferredName().ustring();
+    return jsExecutable()->inferredName().string();
 }
 

trunk/Source/JavaScriptCore/runtime/JSGlobalObject.cpp

@@ -305 +305 @@
     putDirectWithoutTransition(exec->globalData(), Identifier(exec, "URIError"), m_URIErrorConstructor.get(), DontEnum);
 
-    m_evalFunction.set(exec->globalData(), this, JSFunction::create(exec, this, 1, exec->propertyNames().eval.ustring(), globalFuncEval));
+    m_evalFunction.set(exec->globalData(), this, JSFunction::create(exec, this, 1, exec->propertyNames().eval.string(), globalFuncEval));
     putDirectWithoutTransition(exec->globalData(), exec->propertyNames().eval, m_evalFunction.get(), DontEnum);
 

trunk/Source/JavaScriptCore/runtime/JSONObject.cpp

@@ -194 +194 @@
     if (!m_value) {
         if (m_identifier)
-            m_value = jsString(exec, m_identifier->ustring());
+            m_value = jsString(exec, m_identifier->string());
         else
             m_value = jsNumber(m_number);
@@ -558 +558 @@
 
         // Append the property name.
-        appendQuotedString(builder, propertyName.ustring());
+        appendQuotedString(builder, propertyName.string());
         builder.append(':');
         if (stringifier.willIndent())
@@ -770 +770 @@
                 Identifier prop = propertyStack.last()[indexStack.last()];
                 PutPropertySlot slot;
-                JSValue filteredValue = callReviver(object, jsString(m_exec, prop.ustring()), outValue);
+                JSValue filteredValue = callReviver(object, jsString(m_exec, prop.string()), outValue);
                 if (filteredValue.isUndefined())
                     object->methodTable()->deleteProperty(object, m_exec, prop);

trunk/Source/JavaScriptCore/runtime/JSPropertyNameIterator.h

@@ -88 +88 @@
             PropertyNameArrayData::PropertyNameVector& propertyNameVector = propertyNameArrayData->propertyNameVector();
             for (size_t i = 0; i < m_jsStringsSize; ++i)
-                m_jsStrings[i].set(exec->globalData(), this, jsOwnedString(exec, propertyNameVector[i].ustring()));
+                m_jsStrings[i].set(exec->globalData(), this, jsOwnedString(exec, propertyNameVector[i].string()));
             m_offsetBase = object->structure()->firstValidOffset();
         }

trunk/Source/JavaScriptCore/runtime/JSScope.cpp

@@ -211 +211 @@
         return callFrame->lexicalGlobalObject();
 
-    return throwError(callFrame, createErrorForInvalidGlobalAssignment(callFrame, identifier.ustring()));
+    return throwError(callFrame, createErrorForInvalidGlobalAssignment(callFrame, identifier.string()));
 }
 

trunk/Source/JavaScriptCore/runtime/JSString.h

@@ -532 +532 @@
             return globalData.numericStrings.add(value.asDouble());
         if (value.isTrue())
-            return globalData.propertyNames->trueKeyword.ustring();
+            return globalData.propertyNames->trueKeyword.string();
         if (value.isFalse())
-            return globalData.propertyNames->falseKeyword.ustring();
+            return globalData.propertyNames->falseKeyword.string();
         if (value.isNull())
-            return globalData.propertyNames->nullKeyword.ustring();
+            return globalData.propertyNames->nullKeyword.string();
         if (value.isUndefined())
-            return globalData.propertyNames->undefinedKeyword.ustring();
+            return globalData.propertyNames->undefinedKeyword.string();
         return value.toString(exec)->value(exec);
     }

trunk/Source/JavaScriptCore/runtime/LiteralParser.cpp

@@ -665 +665 @@
                         m_lexer.next();
                         if (stringToken.stringIs8Bit)
-                            lastValue = jsString(m_exec, makeIdentifier(stringToken.stringToken8, stringToken.stringLength).ustring());
+                            lastValue = jsString(m_exec, makeIdentifier(stringToken.stringToken8, stringToken.stringLength).string());
                         else
-                            lastValue = jsString(m_exec, makeIdentifier(stringToken.stringToken16, stringToken.stringLength).ustring());
+                            lastValue = jsString(m_exec, makeIdentifier(stringToken.stringToken16, stringToken.stringLength).string());
                         break;
                     }

trunk/Source/JavaScriptCore/runtime/ObjectConstructor.cpp

@@ -85 +85 @@
 void ObjectConstructor::finishCreation(ExecState* exec, ObjectPrototype* objectPrototype)
 {
-    Base::finishCreation(exec->globalData(), Identifier(exec, "Object").ustring());
+    Base::finishCreation(exec->globalData(), Identifier(exec, "Object").string());
     // ECMA 15.2.3.1
     putDirectWithoutTransition(exec->globalData(), exec->propertyNames().prototype, objectPrototype, DontEnum | DontDelete | ReadOnly);
@@ -186 +186 @@
     size_t numProperties = properties.size();
     for (size_t i = 0; i < numProperties; i++)
-        names->push(exec, jsOwnedString(exec, properties[i].ustring()));
+        names->push(exec, jsOwnedString(exec, properties[i].string()));
     return JSValue::encode(names);
 }
@@ -200 +200 @@
     size_t numProperties = properties.size();
     for (size_t i = 0; i < numProperties; i++)
-        keys->push(exec, jsOwnedString(exec, properties[i].ustring()));
+        keys->push(exec, jsOwnedString(exec, properties[i].string()));
     return JSValue::encode(keys);
 }

trunk/Source/JavaScriptCore/runtime/RegExpConstructor.cpp

@@ -93 +93 @@
 void RegExpConstructor::finishCreation(ExecState* exec, RegExpPrototype* regExpPrototype)
 {
-    Base::finishCreation(exec->globalData(), Identifier(exec, "RegExp").ustring());
+    Base::finishCreation(exec->globalData(), Identifier(exec, "RegExp").string());
     ASSERT(inherits(&s_info));