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

Timestamp:

Jul 25, 2011, 11:41:40 AM (14 years ago)

Author:

[email protected]

Message:

JSON errors should be informative
​https://bugs.webkit.org/show_bug.cgi?id=63339

Source/JavaScriptCore:

Added error messages to the JSON Parser.

Patch by Juan C. Montemayor <​[email protected]> on 2011-07-25
Reviewed by Oliver Hunt.

• 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:

(JSC::LiteralParser::getErrorMessage):
(JSC::LiteralParser::Lexer::sawError):
(JSC::LiteralParser::Lexer::getErrorMessage):

LayoutTests:

Updated expected test results.

Patch by Juan C. Montemayor <​[email protected]> on 2011-07-25
Reviewed by Oliver Hunt.

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

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();
         }
         
@@ -113 +121 @@
             }
             
+            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&);
@@ -130 +142 @@
         LiteralParser::Lexer m_lexer;
         ParserMode m_mode;
+        UString m_parseErrorMessage;
         static unsigned const MaximumCachableCharacter = 128;
         FixedArray<Identifier, MaximumCachableCharacter> m_shortIdentifiers;