Allow arbitrary expressions for key

hikari-no-yume · hikari-no-yume · commit 589756cbcccb · 2016-03-25T16:32:12.000Z
diff --git a/Zend/tests/list_keyed_ArrayAccess.phpt b/Zend/tests/list_keyed_ArrayAccess.phpt
@@ -12,6 +12,17 @@ var_dump($good, $happy);
 
 echo PHP_EOL;
 
+$stdClassCollection = new SplObjectStorage;
+$foo = new StdClass;
+$stdClassCollection[$foo] = "foo";
+$bar = new StdClass;
+$stdClassCollection[$bar] = "bar";
+
+list($foo => $fooStr, $bar => $barStr) = $stdClassCollection;
+var_dump($fooStr, $barStr);
+
+echo PHP_EOL;
+
 class IndexPrinter implements ArrayAccess
 {
     public function offsetGet($offset) {
@@ -36,5 +47,8 @@ list("123" => $x) = $op;
 string(3) "bad"
 string(3) "sad"
 
+string(3) "foo"
+string(3) "bar"
+
 GET int(123)
 GET string(3) "123"
diff --git a/Zend/tests/list_keyed_non_literals.phpt b/Zend/tests/list_keyed_non_literals.phpt
@@ -5,21 +5,26 @@ list() with constant keys
 
 $arr = [
     1 => "one",
-    2 => "two"
+    2 => "two",
+    3 => "three"
 ];
 
 const COMPILE_TIME_RESOLVABLE = 1;
 
 define('PROBABLY_NOT_COMPILE_TIME_RESOLVABLE', file_get_contents("data:text/plain,2"));
 
+$probablyNotCompileTimeResolvable3 = cos(0) * 3;
+
 list(
     COMPILE_TIME_RESOLVABLE => $one,
-    PROBABLY_NOT_COMPILE_TIME_RESOLVABLE => $two
+    PROBABLY_NOT_COMPILE_TIME_RESOLVABLE => $two,
+    $probablyNotCompileTimeResolvable3 => $three
 ) = $arr;
 
-var_dump($one, $two);
+var_dump($one, $two, $three);
 
 ?>
 --EXPECTF--
 string(3) "one"
 string(3) "two"
+string(5) "three"
diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y
@@ -1199,9 +1199,9 @@ keyed_assignment_list:
 ;
 
 keyed_assignment_list_element:
-		scalar T_DOUBLE_ARROW variable
+		expr T_DOUBLE_ARROW variable
 			{ $$ = zend_ast_create(ZEND_AST_ARRAY_ELEM, $3, $1); }
-	|	scalar T_DOUBLE_ARROW T_LIST '(' assignment_list ')'
+	|	expr T_DOUBLE_ARROW T_LIST '(' assignment_list ')'
 			{ $$ = zend_ast_create(ZEND_AST_ARRAY_ELEM, $5, $1); }
 ;
 
diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h
@@ -2062,7 +2062,7 @@ ZEND_VM_HANDLER(97, ZEND_FETCH_OBJ_UNSET, VAR|UNUSED|THIS|CV, CONST|TMPVAR|CV)
 	ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION();
 }
 
-ZEND_VM_HANDLER(98, ZEND_FETCH_LIST, CONST|TMPVAR|CV, CONST|TMPVAR)
+ZEND_VM_HANDLER(98, ZEND_FETCH_LIST, CONST|TMPVAR|CV, CONST|TMPVAR|CV)
 {
 	USE_OPLINE
 	zend_free_op free_op1;
diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h

Original file line number	Diff line number	Diff line change
`@@ -1199,9 +1199,9 @@ keyed_assignment_list:`
`1199`	`1199`	`;`
`1200`	`1200`
`1201`	`1201`	`keyed_assignment_list_element:`
`1202`		`- scalar T_DOUBLE_ARROW variable`
	`1202`	`+ expr T_DOUBLE_ARROW variable`
`1203`	`1203`	`{ $$ = zend_ast_create(ZEND_AST_ARRAY_ELEM, $3, $1); }`
`1204`		`- \| scalar T_DOUBLE_ARROW T_LIST '(' assignment_list ')'`
	`1204`	`+ \| expr T_DOUBLE_ARROW T_LIST '(' assignment_list ')'`
`1205`	`1205`	`{ $$ = zend_ast_create(ZEND_AST_ARRAY_ELEM, $5, $1); }`
`1206`	`1206`	`;`
`1207`	`1207`
Original file line number	Diff line number	Diff line change
`@@ -2062,7 +2062,7 @@ ZEND_VM_HANDLER(97, ZEND_FETCH_OBJ_UNSET, VAR\|UNUSED\|THIS\|CV, CONST\|TMPVAR\|CV)`
`2062`	`2062`	`ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTION();`
`2063`	`2063`	`}`
`2064`	`2064`
`2065`		`-ZEND_VM_HANDLER(98, ZEND_FETCH_LIST, CONST\|TMPVAR\|CV, CONST\|TMPVAR)`
	`2065`	`+ZEND_VM_HANDLER(98, ZEND_FETCH_LIST, CONST\|TMPVAR\|CV, CONST\|TMPVAR\|CV)`
`2066`	`2066`	`{`
`2067`	`2067`	`USE_OPLINE`
`2068`	`2068`	`zend_free_op free_op1;`