Changeset 91715 in webkit for trunk/Source/JavaScriptCore/runtime/LiteralParser.h

Timestamp:

Jul 25, 2011, 3:59:19 PM (14 years ago)

Author:

[email protected]

Message:

Unreviewed, rolling out r91686.
​http://trac.webkit.org/changeset/91686
​https://bugs.webkit.org/show_bug.cgi?id=65144

1.5% regression in JSC (Requested by jmontemayor on #webkit).

Patch by Sheriff Bot <​[email protected]> on 2011-07-25

Source/JavaScriptCore:

• runtime/JSONObject.cpp:

(JSC::JSONProtoFuncParse):

• runtime/LiteralParser.cpp:

(JSC::LiteralParser::Lexer::lex):
(JSC::LiteralParser::Lexer::lexString):
(JSC::LiteralParser::Lexer::lexNumber):
(JSC::LiteralParser::parse):

• runtime/LiteralParser.h:

LayoutTests:

• fast/js/JSON-parse-expected.txt:
• platform/chromium/fast/js/JSON-parse-expected.txt: Removed.

File:

• trunk/Source/JavaScriptCore/runtime/LiteralParser.h (modified) (3 diffs)

trunk/Source/JavaScriptCore/runtime/LiteralParser.h

@@ -42 +42 @@
             , m_mode(mode)
         {
-        }
-        
-        UString getErrorMessage() 
-        { 
-            if (m_parseErrorMessage.isEmpty())
-                m_parseErrorMessage = "Unable to parse JSON string";
-            UString errorMessage = m_lexer.sawError() ?  m_lexer.getErrorMessage() : m_parseErrorMessage;
-            return String::format("JSON Parse error: %s", errorMessage.ascii().data()).impl();
         }
         
@@ -121 +113 @@
             }
             
-            bool sawError() { return !m_lexErrorMessage.isEmpty(); }
-            UString getErrorMessage() { return m_lexErrorMessage; }
-            
         private:
-            UString m_lexErrorMessage;
             template <ParserMode mode> TokenType lex(LiteralParserToken&);
             template <ParserMode mode, UChar terminator> ALWAYS_INLINE TokenType lexString(LiteralParserToken&);
@@ -142 +130 @@
         LiteralParser::Lexer m_lexer;
         ParserMode m_mode;
-        UString m_parseErrorMessage;
         static unsigned const MaximumCachableCharacter = 128;
         FixedArray<Identifier, MaximumCachableCharacter> m_shortIdentifiers;