Changeset 90159 in webkit

Timestamp:

Jun 30, 2011, 2:41:58 PM (15 years ago)

Author:

commit-queue@webkit.org

Message:

2011-06-30 Juan C. Montemayor <​jmont@apple.com>

Reviewed by Geoffrey Garen.

Web Inspector fails to display source for eval with syntax error
​https://bugs.webkit.org/show_bug.cgi?id=63583

Added new LayoutTest to check that the correct line number is added to a
syntax error inside an eval statement.

• fast/js/eval-contained-syntax-error-expected.txt: Added.
• fast/js/eval-contained-syntax-error.html: Added.
• fast/js/script-tests/eval-contained-syntax-error.js: Added.
• platform/chromium/fast/js/eval-contained-syntax-error-expected.txt: Added.

2011-06-30 Juan C. Montemayor <​jmont@apple.com>

Reviewed by Geoffrey Garen.

Web Inspector fails to display source for eval with syntax error
​https://bugs.webkit.org/show_bug.cgi?id=63583

Web Inspector now displays a link to an eval statement that contains
a syntax error.

• parser/Parser.h: (JSC::isEvalNode): (JSC::EvalNode): (JSC::Parser::parse):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/js/eval-contained-syntax-error-expected.txt (added)
• LayoutTests/fast/js/eval-contained-syntax-error.html (added)
• LayoutTests/fast/js/script-tests/eval-contained-syntax-error.js (added)
• LayoutTests/platform/chromium/fast/js/eval-contained-syntax-error-expected.txt (added)
• Source/JavaScriptCore/ChangeLog (modified) (1 diff)
• Source/JavaScriptCore/parser/Parser.h (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-06-30  Juan C. Montemayor  <jmont@apple.com>
+
+        Reviewed by Geoffrey Garen.
+
+        Web Inspector fails to display source for eval with syntax error
+        https://bugs.webkit.org/show_bug.cgi?id=63583
+
+        Added new LayoutTest to check that the correct line number is added to a
+        syntax error inside an eval statement.
+
+        * fast/js/eval-contained-syntax-error-expected.txt: Added.
+        * fast/js/eval-contained-syntax-error.html: Added.
+        * fast/js/script-tests/eval-contained-syntax-error.js: Added.
+        * platform/chromium/fast/js/eval-contained-syntax-error-expected.txt: Added.
+
 2011-06-30  Nate Chapin  <japhet@chromium.org>
 

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2011-06-30  Juan C. Montemayor  <jmont@apple.com>
+
+        Reviewed by Geoffrey Garen.
+
+        Web Inspector fails to display source for eval with syntax error
+        https://bugs.webkit.org/show_bug.cgi?id=63583
+
+        Web Inspector now displays a link to an eval statement that contains
+        a syntax error.
+
+        * parser/Parser.h:
+        (JSC::isEvalNode):
+        (JSC::EvalNode):
+        (JSC::Parser::parse):
+
 2011-06-30  Filip Pizlo  <fpizlo@apple.com>
 

trunk/Source/JavaScriptCore/parser/Parser.h

@@ -44 +44 @@
     class UString;
 
+    template <typename T> inline bool isEvalNode() { return false; }
+    template <> inline bool isEvalNode<EvalNode>() { return true; }
     template <typename T> struct ParserArenaData : ParserArenaDeletable { T data; };
 
@@ -110 +112 @@
             if (isFunctionBodyNode(static_cast<ParsedNode*>(0)))
                 *exception = createStackOverflowError(lexicalGlobalObject);
+            else if (isEvalNode<ParsedNode>())
+                *exception = createSyntaxError(lexicalGlobalObject, errMsg);
             else
                 *exception = addErrorInfo(&lexicalGlobalObject->globalData(), createSyntaxError(lexicalGlobalObject, errMsg), errLine, source);