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

Timestamp:

Sep 5, 2012, 4:04:33 AM (13 years ago)

Author:

[email protected]

Message:

Fix the uses of String::operator+=() for Mac
​https://bugs.webkit.org/show_bug.cgi?id=95818

Patch by Benjamin Poulain <​[email protected]> on 2012-09-05
Reviewed by Dan Bernstein.

Source/JavaScriptCore:

• jsc.cpp:

(functionJSCStack): Use StringBuilder to create the stack dump, it is faster
and avoid String::operator+=().

• parser/Parser.h:

(JSC::Parser::updateErrorMessageSpecialCase):
(JSC::Parser::updateErrorMessage):
(JSC::Parser::updateErrorWithNameAndMessage):
Use the String operators (and makeString) to concatenate the strings.

Source/WebCore:

• bindings/js/JSCSSStyleDeclarationCustom.cpp:

(WebCore::JSCSSStyleDeclaration::putDelegate):
This is a legitimate use of String::append(), it is the only
concatenation in this function.

• loader/appcache/ManifestParser.cpp:

(WebCore::parseManifest): Ditto.

File:

• trunk/Source/JavaScriptCore/parser/Parser.h (modified) (3 diffs)

trunk/Source/JavaScriptCore/parser/Parser.h

@@ -736 +736 @@
     ALWAYS_INLINE void updateErrorMessageSpecialCase(JSTokenType expectedToken) 
     {
-        String errorMessage;
         switch (expectedToken) {
         case RESERVED_IF_STRICT:
-            errorMessage = "Use of reserved word '";
-            errorMessage += getToken().impl();
-            errorMessage += "' in strict mode";
-            m_errorMessage = errorMessage.impl();
+            m_errorMessage = "Use of reserved word '" + getToken() + "' in strict mode";
             return;
         case RESERVED:
-            errorMessage = "Use of reserved word '";
-            errorMessage += getToken().impl();
-            errorMessage += "'";
-            m_errorMessage = errorMessage.impl();
+            m_errorMessage = "Use of reserved word '" + getToken() + '\'';
             return;
         case NUMBER: 
-            errorMessage = "Unexpected number '";
-            errorMessage += getToken().impl();
-            errorMessage += "'";
-            m_errorMessage = errorMessage.impl();
+            m_errorMessage = "Unexpected number '" + getToken() + '\'';
             return;
         case IDENT: 
-            errorMessage = "Expected an identifier but found '";
-            errorMessage += getToken().impl();
-            errorMessage += "' instead";
-            m_errorMessage = errorMessage.impl();
+            m_errorMessage = "Expected an identifier but found '" + getToken() + "' instead";
             return;
         case STRING: 
-            errorMessage = "Unexpected string ";
-            errorMessage += getToken().impl();
-            m_errorMessage = errorMessage.impl();
+            m_errorMessage = "Unexpected string " + getToken();
             return;
         case ERRORTOK: 
-            errorMessage = "Unrecognized token '";
-            errorMessage += getToken().impl();
-            errorMessage += "'";
-            m_errorMessage = errorMessage.impl();
+            m_errorMessage = "Unrecognized token '" + getToken() + '\'';
             return;
         case EOFTOK:  
-            m_errorMessage = "Unexpected EOF";
+            m_errorMessage = ASCIILiteral("Unexpected EOF");
             return;
         case RETURN:
-            m_errorMessage = "Return statements are only valid inside functions";
+            m_errorMessage = ASCIILiteral("Return statements are only valid inside functions");
             return;
         default:
             ASSERT_NOT_REACHED();
-            m_errorMessage = "internal error";
+            m_errorMessage = ASCIILiteral("internal error");
             return;
         }
@@ -807 +789 @@
             else
                 updateErrorMessageSpecialCase(expectedToken);
-        } 
+        }
     }
     
@@ -813 +795 @@
     {
         m_error = true;
-        String prefix(beforeMsg);
-        String postfix(afterMsg);
-        prefix += " '";
-        prefix += name.impl();
-        prefix += "' ";
-        prefix += postfix;
-        m_errorMessage = prefix.impl();
-    }
-    
-    NEVER_INLINE void updateErrorMessage(const char* msg) 
+        m_errorMessage = makeString(beforeMsg, " '", name, "' ", afterMsg);
+    }
+    
+    NEVER_INLINE void updateErrorMessage(const char* msg)
     {   
         m_error = true;