Changeset 201488 in webkit

Timestamp:

May 28, 2016, 11:26:41 AM (10 years ago)

Author:

gskachkov@gmail.com

Message:

[Next] Trailing commas in function parameters.
​https://bugs.webkit.org/show_bug.cgi?id=158020

Reviewed by Keith Miller.

ESNext allow to add trailing commas in function parameters and function arguments.
Link to spec - ​https://jeffmo.github.io/es-trailing-function-commas
Example of using - (function (a, b,) { return a + b; })(1,2,);

• parser/Parser.cpp:

(JSC::Parser<LexerType>::parseFormalParameters):
(JSC::Parser<LexerType>::parseArguments):

• tests/stress/trailing-comma-in-function-paramters.js: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/js/parser-syntax-check-expected.txt (modified) (2 diffs)
• LayoutTests/js/script-tests/parser-syntax-check.js (modified) (2 diffs)
• LayoutTests/sputnik/Conformance/13_Function_Definition/S13_A5.html (modified) (1 diff)
• Source/JavaScriptCore/ChangeLog (modified) (1 diff)
• Source/JavaScriptCore/parser/Parser.cpp (modified) (2 diffs)
• Source/JavaScriptCore/tests/stress/trailing-comma-in-function-paramters.js (added)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2016-05-25  Skachkov Oleksandr  <gskachkov@gmail.com>
+
+        [ESNext] Support trailing commas in function param lists
+        https://bugs.webkit.org/show_bug.cgi?id=158020
+
+        Reviewed by Keith Miller.
+
+        * js/parser-syntax-check-expected.txt:
+        * js/script-tests/parser-syntax-check.js:
+        * sputnik/Conformance/13_Function_Definition/S13_A5.html:
+
 2016-05-27  Zalan Bujtas  <zalan@apple.com>
 

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

@@ -138 +138 @@
 PASS Invalid: "a(5,"
 PASS Invalid: "function f() { a(5, }"
-PASS Invalid: "a(5,)"
-PASS Invalid: "function f() { a(5,) }"
+PASS Valid:   "a(5,)" with ReferenceError
+PASS Valid:   "function f() { a(5,) }"
 PASS Invalid: "a(5,6"
 PASS Invalid: "function f() { a(5,6 }"
@@ -173 +173 @@
 PASS Invalid: "function f(a b) {}"
 PASS Invalid: "function f() { function f(a b) {} }"
-PASS Invalid: "function f(a,) {}"
-PASS Invalid: "function f() { function f(a,) {} }"
+PASS Valid:   "function f(a,) {}"
+PASS Valid:   "function f() { function f(a,) {} }"
 PASS Invalid: "function f(a,"
 PASS Invalid: "function f() { function f(a, }"

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

@@ -148 +148 @@
 invalid("a(5");
 invalid("a(5,");
-invalid("a(5,)");
+valid("a(5,)");
 invalid("a(5,6");
 valid  ("a(b[7], c <d> e.l, new a() > b)");
@@ -168 +168 @@
 invalid("function () {}");
 invalid("function f(a b) {}");
-invalid("function f(a,) {}");
+valid("function f(a,) {}");
 invalid("function f(a,");
 invalid("function f(a, 1) {}");

trunk/LayoutTests/sputnik/Conformance/13_Function_Definition/S13_A5.html

@@ -101 +101 @@
 //CHECK#3
 try{
-        eval("function __func(arg1, arg2, arg3,){return arguments.length;}");
-        testFailed('#3: eval("function __func(arg1, arg2, arg3,){return arguments.length;}") lead to throwing exception')
+        eval("function __func(arg1, arg2, arg3,,){return arguments.length;}");
+        testFailed('#3: eval("function __func(arg1, arg2, arg3,,){return arguments.length;}") lead to throwing exception')
 } catch(e){
         if(!(e instanceof SyntaxError)){
-                testFailed('#3.1: eval("function __func(arg1, arg2, arg3,){return arguments.length;}") lead to throwing exception of SyntaxError. Actual: exception is '+e);
+                testFailed('#3.1: eval("function __func(arg1, arg2, arg3,,){return arguments.length;}") lead to throwing exception of SyntaxError. Actual: exception is '+e);
         }
 }

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2016-05-28  Skachkov Oleksandr  <gskachkov@gmail.com>
+        [ESNext] Trailing commas in function parameters.
+        https://bugs.webkit.org/show_bug.cgi?id=158020
+
+        Reviewed by Keith Miller.
+
+        ESNext allow to add trailing commas in function parameters and function arguments.
+        Link to spec - https://jeffmo.github.io/es-trailing-function-commas 
+        Example of using - (function (a, b,) { return a + b; })(1,2,);
+
+        * parser/Parser.cpp:
+        (JSC::Parser<LexerType>::parseFormalParameters):
+        (JSC::Parser<LexerType>::parseArguments):
+        * tests/stress/trailing-comma-in-function-paramters.js: Added.
+
 2016-05-28  Yusuke Suzuki  <utatane.tea@gmail.com>
 

trunk/Source/JavaScriptCore/parser/Parser.cpp

@@ -1838 +1838 @@
         TreeExpression defaultValue = 0;
 
+        if (match(CLOSEPAREN))
+            break;
+        
         if (match(DOTDOTDOT)) {
             next();
@@ -4064 +4067 @@
         next(TreeBuilder::DontBuildStrings);
 
+        if (match(CLOSEPAREN))
+            break;
+        
         TreeExpression arg = parseArgument(context, argType);
         propagateError();