Changeset 89228 in webkit

Timestamp:

Jun 19, 2011 8:50:36 PM (13 years ago)

Author:

oliver@apple.com

Message:

2011-06-19 Oliver Hunt <​oliver@apple.com>

Reviewed by Sam Weinig.

Correct logic for putting errors on the correct line when handling JSONP
​https://bugs.webkit.org/show_bug.cgi?id=62962

Add test case this time

• fast/js/parser-syntax-check-expected.txt:
• fast/js/script-tests/parser-syntax-check.js:

2011-06-19 Oliver Hunt <​oliver@apple.com>

Reviewed by Sam Weinig.

Correct logic for putting errors on the correct line when handling JSONP
​https://bugs.webkit.org/show_bug.cgi?id=62962

Minor fix for the minor fix. *sigh*

• interpreter/Interpreter.cpp: (JSC::Interpreter::execute):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/js/parser-syntax-check-expected.txt (modified) (1 diff)
• LayoutTests/fast/js/script-tests/parser-syntax-check.js (modified) (1 diff)
• Source/JavaScriptCore/ChangeLog (modified) (1 diff)
• Source/JavaScriptCore/interpreter/Interpreter.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-06-19  Oliver Hunt  <oliver@apple.com>
+
+        Reviewed by Sam Weinig.
+
+        Correct logic for putting errors on the correct line when handling JSONP
+        https://bugs.webkit.org/show_bug.cgi?id=62962
+
+        Add test case this time
+
+        * fast/js/parser-syntax-check-expected.txt:
+        * fast/js/script-tests/parser-syntax-check.js:
+
 2011-06-19  Adam Bergkvist  <adam.bergkvist@ericsson.com>
 

trunk/LayoutTests/fast/js/parser-syntax-check-expected.txt

@@ -568 +568 @@
 PASS Valid:   "if (0) obj.foo\u03bb; "
 PASS Valid:   "function f() { if (0) obj.foo\u03bb;  }"
+PASS e.line is 1
+PASS foo is 'PASS'
+PASS bar is 'PASS'
 PASS successfullyParsed is true
 

trunk/LayoutTests/fast/js/script-tests/parser-syntax-check.js

@@ -362 +362 @@
 valid("if (0) obj.foo\\u03bb; ")
 
+try { eval("a.b.c = {};"); } catch(e1) { e=e1; shouldBe("e.line", "1") }
+foo = 'FAIL';
+bar = 'PASS';
+try {
+     eval("foo = 'PASS'; a.b.c = {}; bar  = 'FAIL';");
+} catch(e) {
+     shouldBe("foo", "'PASS'");
+     shouldBe("bar", "'PASS'");
+}
+
 var successfullyParsed = true;

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2011-06-19  Oliver Hunt  <oliver@apple.com>
+
+        Reviewed by Sam Weinig.
+
+        Correct logic for putting errors on the correct line when handling JSONP
+        https://bugs.webkit.org/show_bug.cgi?id=62962
+
+        Minor fix for the minor fix.  *sigh*
+
+        * interpreter/Interpreter.cpp:
+        (JSC::Interpreter::execute):
+
 2011-06-19  Oliver Hunt  <oliver@apple.com>
 

trunk/Source/JavaScriptCore/interpreter/Interpreter.cpp

@@ -772 +772 @@
                         PropertySlot slot(globalObject);
                         if (!globalObject->getPropertySlot(callFrame, JSONPPath[i].m_pathEntryName, slot)) {
-                            if (i)
+                            if (entry)
                                 return throwError(callFrame, createUndefinedVariableError(globalObject->globalExec(), JSONPPath[i].m_pathEntryName));
                             goto failedJSONP;