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

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/parser

Files:

• ASTBuilder.h (modified) (1 diff)
• Parser.cpp (modified) (1 diff)
• Parser.h (modified) (4 diffs)
• SyntaxChecker.h (modified) (1 diff)

trunk/Source/JavaScriptCore/parser/ASTBuilder.h

@@ -221 +221 @@
     ExpressionNode* createRegExp(const JSTokenLocation& location, const Identifier& pattern, const Identifier& flags, int start)
     {
-        if (Yarr::checkSyntax(pattern.ustring()))
+        if (Yarr::checkSyntax(pattern.string()))
             return 0;
         RegExpNode* node = new (m_globalData) RegExpNode(location, pattern, flags);

trunk/Source/JavaScriptCore/parser/Parser.cpp

@@ -1510 +1510 @@
         TreeExpression re = context.createRegExp(location, *pattern, *flags, start);
         if (!re) {
-            const char* yarrErrorMsg = Yarr::checkSyntax(pattern->ustring());
+            const char* yarrErrorMsg = Yarr::checkSyntax(pattern->string());
             ASSERT(!m_errorMessage.isNull());
             failWithMessage(yarrErrorMsg);

trunk/Source/JavaScriptCore/parser/Parser.h

@@ -211 +211 @@
     void declareCallee(const Identifier* ident)
     {
-        m_declaredVariables.add(ident->ustring().impl());
+        m_declaredVariables.add(ident->string().impl());
     }
 
@@ -218 +218 @@
         bool isValidStrictMode = m_globalData->propertyNames->eval != *ident && m_globalData->propertyNames->arguments != *ident;
         m_isValidStrictMode = m_isValidStrictMode && isValidStrictMode;
-        m_declaredVariables.add(ident->ustring().impl());
+        m_declaredVariables.add(ident->string().impl());
         return isValidStrictMode;
     }
@@ -234 +234 @@
     {
         bool isArguments = m_globalData->propertyNames->arguments == *ident;
-        bool isValidStrictMode = m_declaredVariables.add(ident->ustring().impl()).isNewEntry && m_globalData->propertyNames->eval != *ident && !isArguments;
+        bool isValidStrictMode = m_declaredVariables.add(ident->string().impl()).isNewEntry && m_globalData->propertyNames->eval != *ident && !isArguments;
         m_isValidStrictMode = m_isValidStrictMode && isValidStrictMode;
         if (isArguments)
@@ -244 +244 @@
     {
         m_usesEval |= isEval;
-        m_usedVariables.add(ident->ustring().impl());
+        m_usedVariables.add(ident->string().impl());
     }
 

trunk/Source/JavaScriptCore/parser/SyntaxChecker.h

@@ -145 +145 @@
     ExpressionType createBracketAccess(const JSTokenLocation&, ExpressionType, ExpressionType, bool, int, int, int) { return BracketExpr; }
     ExpressionType createDotAccess(const JSTokenLocation&, ExpressionType, const Identifier*, int, int, int) { return DotExpr; }
-    ExpressionType createRegExp(const JSTokenLocation&, const Identifier& pattern, const Identifier&, int) { return Yarr::checkSyntax(pattern.ustring()) ? 0 : RegExpExpr; }
+    ExpressionType createRegExp(const JSTokenLocation&, const Identifier& pattern, const Identifier&, int) { return Yarr::checkSyntax(pattern.string()) ? 0 : RegExpExpr; }
     ExpressionType createNewExpr(const JSTokenLocation&, ExpressionType, int, int, int, int) { return NewExpr; }
     ExpressionType createNewExpr(const JSTokenLocation&, ExpressionType, int, int) { return NewExpr; }