Allow trailing comma

hikari-no-yume · hikari-no-yume · commit 14bfe93ddc34 · 2016-03-25T16:32:11.000Z
diff --git a/Zend/tests/list_keyed_trailing_comma.phpt b/Zend/tests/list_keyed_trailing_comma.phpt
@@ -0,0 +1,38 @@
+--TEST--
+list() with keys and a trailing comma
+--FILE--
+<?php
+
+$antonyms = [
+    "good" => "bad",
+    "happy" => "sad",
+];
+
+list(
+    "good" => $good,
+    "happy" => $happy
+) = $antonyms;
+
+var_dump($good, $happy);
+
+echo PHP_EOL;
+
+$antonyms = [
+    "good" => "bad",
+    "happy" => "sad",
+];
+
+list(
+    "good" => $good,
+    "happy" => $happy,
+) = $antonyms;
+
+var_dump($good, $happy);
+
+?>
+--EXPECT--
+string(3) "bad"
+string(3) "sad"
+
+string(3) "bad"
+string(3) "sad"
diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y
@@ -1174,7 +1174,7 @@ property_name:
 assignment_list:
 		unkeyed_assignment_list
 			{ $$ = $1; }
-	|	keyed_assignment_list
+	|	keyed_assignment_list possible_comma
 			{ $$ = $1; }
 ;
 

Original file line number	Diff line number	Diff line change
`@@ -1174,7 +1174,7 @@ property_name:`
`1174`	`1174`	`assignment_list:`
`1175`	`1175`	`unkeyed_assignment_list`
`1176`	`1176`	`{ $$ = $1; }`
`1177`		`- \| keyed_assignment_list`
	`1177`	`+ \| keyed_assignment_list possible_comma`
`1178`	`1178`	`{ $$ = $1; }`
`1179`	`1179`	`;`
`1180`	`1180`