Fix #394: Broken array expansion in foreach.'

Author: dim-s

jphp-core/src/org/develnext/jphp/core/syntax/generators/ExprGenerator.java

@@ -158,7 +158,8 @@ protected void processForeach(ForeachStmtToken result, ListIterator<Token> itera
         if (!isOpenedBrace(next, BraceExprToken.Kind.SIMPLE))
             unexpectedToken(next, "(");
 
-        ExprStmtToken expr = analyzer.generator(SimpleExprGenerator.class).getToken(nextToken(iterator), iterator, Separator.AS, null);
+        ExprStmtToken expr = analyzer.generator(SimpleExprGenerator.class)
+                .getToken(nextToken(iterator), iterator, Separator.AS, null);
 
         if (expr == null) {
             unexpectedToken(iterator.previous());
@@ -188,7 +189,7 @@ protected void processForeach(ForeachStmtToken result, ListIterator<Token> itera
                 next = nextToken(iterator);
             }
 
-            if (next instanceof ListExprToken) {
+            if (next instanceof ListExprToken || isOpenedBrace(next, ARRAY)) {
                 ListExprToken listExpr = analyzer.generator(SimpleExprGenerator.class)
                         .processSingleList(next, iterator);
 

jphp-core/tests/org/develnext/jphp/core/compiler/jvm/LoopsTest.java

@@ -47,4 +47,9 @@ public void testForeachList() {
         check("loops/foreach_list_003.php", true);
         check("loops/foreach_list_004.php", true);
     }
+
+    @Test
+    public void testBug394() {
+        check("loops/bug394.phpt", true);
+    }
 }

jphp-core/tests/resources/loops/bug394.phpt

@@ -0,0 +1,19 @@
+--TEST--
+Broken array expansion in foreach
+--FILE--
+<?php
+
+foreach ([['a', 'b'], ['c', 'd'], ['x', 'y']] as $index => [$name, $value]) {
+    var_dump($index, $name, $value);
+}
+?>
+--EXPECTF--
+int(0)
+string(1) "a"
+string(1) "b"
+int(1)
+string(1) "c"
+string(1) "d"
+int(2)
+string(1) "x"
+string(1) "y"