From: Andi Gutmans <andi@php.net>
Date: Tue, 14 Mar 2000 15:37:15 +0000 (+0000)
Subject: - Allow array(1,2,3,) i.e. with trailing comma. You can only have one
X-Git-Tag: PHP-4.0-RC1~142
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bc8e138250309af3b0de57db44e5ed8a84b7c247;p=php

- Allow array(1,2,3,) i.e. with trailing comma. You can only have one
  trailing comma.
---

diff --git a/Zend/zend-parser.y b/Zend/zend-parser.y
index 6029e1e1b5..1938e0949b 100644
--- a/Zend/zend-parser.y
+++ b/Zend/zend-parser.y
@@ -547,9 +547,13 @@ scalar:
 
 static_array_pair_list:
 		/* empty */ 						{ $$.op_type = IS_CONST; INIT_PZVAL(&$$.u.constant); array_init(&$$.u.constant); }
-	|	non_empty_static_array_pair_list	{ $$ = $1; }
+	|	non_empty_static_array_pair_list possible_comma	{ $$ = $1; }
 ;
 
+possible_comma:
+		/* empty */
+	|	','
+;
 
 non_empty_static_array_pair_list:
 		non_empty_static_array_pair_list ',' static_scalar T_DOUBLE_ARROW static_scalar	{ do_add_static_array_element(&$$, &$3, &$5); }
@@ -657,7 +661,7 @@ assignment_list_element:
 
 array_pair_list:
 		/* empty */ 				{ do_init_array(&$$, NULL, NULL, 0 CLS_CC); }
-	|	non_empty_array_pair_list	{ $$ = $1; }
+	|	non_empty_array_pair_list possible_comma	{ $$ = $1; }
 ;
 
 non_empty_array_pair_list: