Match blocks 2

Zend/Optimizer/zend_optimizer.c

@@ -791,6 +791,11 @@ void zend_optimizer_shift_jump(zend_op_array *op_array, zend_op *opline, uint32_
 			opline->extended_value = ZEND_OPLINE_NUM_TO_OFFSET(op_array, opline, ZEND_OFFSET_TO_OPLINE_NUM(op_array, opline, opline->extended_value) - shiftlist[ZEND_OFFSET_TO_OPLINE_NUM(op_array, opline, opline->extended_value)]);
 			break;
 		}
+		case ZEND_FREE_RANGE: {
+			opline->op1.num -= shiftlist[opline->op1.num];
+			opline->op2.num -= shiftlist[opline->op2.num];
+			break;
+		}
 	}
 }
 

Zend/tests/block_expr/coalesce.phpt

@@ -0,0 +1,21 @@
+--TEST--
+Coalesce block
+--FILE--
+<?php
+$x = null;
+$y = $x ?? {
+    echo "Executed\n";
+    42
+};
+var_dump($y);
+
+$x = 42;
+$y = $x ?? {
+    echo "Never executed\n";
+};
+var_dump($y);
+?>
+--EXPECT--
+Executed
+int(42)
+int(42)

Zend/tests/block_expr/coalesce_assign.phpt

@@ -0,0 +1,21 @@
+--TEST--
+Coalesce assignment block
+--FILE--
+<?php
+$x = null;
+$x ??= {
+    echo "Executed\n";
+    42
+};
+var_dump($x);
+
+$x = 42;
+$x ??= {
+    echo "Never executed\n";
+};
+var_dump($x);
+?>
+--EXPECT--
+Executed
+int(42)
+int(42)

Zend/tests/block_expr/control_flow.phpt

@@ -0,0 +1,21 @@
+--TEST--
+Control flow in block
+--FILE--
+<?php
+
+function test() {
+    foreach ([1, 2, 3] as $v) {
+        var_dump($v);
+        str_repeat('a', 10) . (null ?? {
+            continue;
+        });
+    }
+}
+
+test();
+
+?>
+--EXPECT--
+int(1)
+int(2)
+int(3)

Zend/tests/match/block_arg_return.phpt

@@ -0,0 +1,15 @@
+--TEST--
+Match expression block must not use return
+--FILE--
+<?php
+function test() {
+    var_dump(match (1) {
+        1 => { return; }
+    });
+    echo 'Unreached';
+}
+test();
+?>
+===DONE===
+--EXPECT--
+===DONE===

Zend/tests/match/block_basic.phpt

@@ -0,0 +1,35 @@
+--TEST--
+Basic match blocks
+--FILE--
+<?php
+function foo() {
+    echo "foo()\n";
+}
+
+function bar() {
+    return 3;
+}
+
+function test($value) {
+    var_dump(match ($value) {
+        1 => { 1 },
+        2 => {
+            $x = 2;
+            $x
+        },
+        3 => {
+            foo();
+            bar()
+        },
+    });
+}
+
+test(1);
+test(2);
+test(3);
+?>
+--EXPECT--
+int(1)
+int(2)
+foo()
+int(3)

Zend/tests/match/block_expr_break_escape.phpt

@@ -0,0 +1,15 @@
+--TEST--
+Match expression block must not use break
+--FILE--
+<?php
+function test() {
+    str_repeat('a', 10) . match (1) {
+        1 => { return; },
+    };
+}
+
+test();
+?>
+===DONE===
+--EXPECT--
+===DONE===

Zend/tests/match/block_expr_break_no_escape.phpt

@@ -0,0 +1,17 @@
+--TEST--
+Match expression block may use break if block is not escaped
+--FILE--
+<?php
+var_dump(match (1) {
+    1 => {
+        foreach ([1, 2, 3] as $value) {
+            echo $value, "\n";
+            break;
+        }
+        42
+    },
+});
+?>
+--EXPECT--
+1
+int(42)

Zend/tests/match/block_expr_goto_escape.phpt

@@ -0,0 +1,14 @@
+--TEST--
+Match expression block must not use goto
+--FILE--
+<?php
+var_dump(match (1) {
+    1 => {
+        goto after;
+    },
+});
+after:
+?>
+===DONE===
+--EXPECT--
+===DONE===

Zend/tests/match/block_expr_goto_into.phpt

@@ -0,0 +1,14 @@
+--TEST--
+May not goto into match expression block
+--FILE--
+<?php
+goto in;
+var_dump(match (1) {
+    1 => {
+in:
+        42
+    },
+});
+?>
+--EXPECTF--
+Fatal error: 'goto' into loop or switch statement is disallowed in %s on line %d

Zend/tests/match/block_expr_no_result.phpt

@@ -0,0 +1,20 @@
+--TEST--
+Match expression block must return a value
+--FILE--
+<?php
+function test() {
+    var_dump(match (1) {
+        1 => {
+            echo "Not returning anything\n";
+        },
+    });
+}
+try {
+    test();
+} catch (Error $e) {
+    echo $e->getMessage(), "\n";
+}
+?>
+--EXPECT--
+Not returning anything
+NULL

Zend/tests/match/block_expr_return.phpt

@@ -0,0 +1,16 @@
+--TEST--
+Match expression block must not use return
+--FILE--
+<?php
+
+function test($a) {
+    var_dump([$a] + match ($a) {
+        42 => { return $a; },
+    });
+}
+
+var_dump(test(42));
+
+?>
+--EXPECT--
+int(42)

Zend/tests/match/block_expr_throw.phpt

@@ -0,0 +1,20 @@
+--TEST--
+Throwing match expression block must clean up live-vars
+--FILE--
+<?php
+
+function throw_($value) {
+    var_dump([new \stdClass] + match ($value) {
+        1 => { throw new Exception('Exception with live var'); },
+    });
+}
+
+try {
+    throw_(1);
+} catch (Exception $e) {
+    echo $e->getMessage(), "\n";
+}
+
+?>
+--EXPECT--
+Exception with live var

Zend/tests/match/block_stmt_break_escape.phpt

@@ -0,0 +1,16 @@
+--TEST--
+Match statement block may break out of block
+--FILE--
+<?php
+match (1) {
+    1 => {
+        echo "Before break\n";
+        break;
+        echo "After break\n";
+    },
+};
+echo "After match\n";
+?>
+--EXPECT--
+Before break
+After match

Zend/tests/match/block_stmt_continue_escape.phpt

@@ -0,0 +1,17 @@
+--TEST--
+Match statement block may continue out of block, with a warning
+--FILE--
+<?php
+match (1) {
+    1 => {
+        echo "Before continue\n";
+        continue;
+        echo "After continue\n";
+    },
+};
+echo "After match\n";
+?>
+--EXPECTF--
+Warning: "continue" targeting switch is equivalent to "break" in %s on line %d
+Before continue
+After match

Zend/tests/match/block_stmt_goto_escape.phpt

@@ -0,0 +1,17 @@
+--TEST--
+May escape match statement block with goto
+--FILE--
+<?php
+match (1) {
+    1 => {
+        echo "Before goto\n";
+        goto after;
+        echo "After goto\n";
+    },
+};
+after:
+echo "After match\n";
+?>
+--EXPECT--
+Before goto
+After match

Zend/tests/match/block_stmt_goto_into.phpt

@@ -0,0 +1,14 @@
+--TEST--
+May not goto into match statement block
+--FILE--
+<?php
+goto in;
+match (1) {
+    1 => {
+in:
+        echo "Inside match block\n";
+    },
+};
+?>
+--EXPECTF--
+Fatal error: 'goto' into loop or switch statement is disallowed in %s on line %d

Zend/tests/match/block_stmt_with_result.phpt

@@ -0,0 +1,11 @@
+--TEST--
+Match statement block must not return a value
+--FILE--
+<?php
+match (1) {
+    1 => { new stdClass },
+};
+?>
+===DONE===
+--EXPECT--
+===DONE===

Zend/tests/match/bugs/001.phpt

@@ -0,0 +1,27 @@
+--TEST--
+WIP
+--FILE--
+<?php
+
+function test() {
+    foreach ([1, 2, 3] as $value) {
+        $x = match (1) {
+            1 => {
+                $y = match (1) {
+                    1 => {
+                        return 42;
+                    },
+                };
+                return 42;
+            },
+        };
+        var_dump($value);
+    }
+    throw new Exception('Unreachable');
+}
+
+var_dump(test());
+
+?>
+--EXPECT--
+int(42)

Zend/tests/match/bugs/002.phpt

@@ -0,0 +1,20 @@
+--TEST--
+WIP
+--FILE--
+<?php
+
+function test() {
+    foreach ([1, 2, 3] as $value) {
+        $x = match (1) {
+            1 => { continue 2; },
+        };
+        var_dump($value);
+    }
+    return 42;
+}
+
+var_dump(test());
+
+?>
+--EXPECT--
+int(42)