Fix children() accessor for match expressions and conditions

See xp-framework/compiler#101

ChangeLog.md

@@ -3,6 +3,11 @@ XP AST ChangeLog
 
 ## ?.?.? / ????-??-??
 
+## 7.0.3 / 2021-02-22
+
+* Fixed children() accessor for `match` expressions and conditions, see
+  xp-framework/compiler#101
+  (@thekid)
 * Fixed PHP 8.1 compatiblity by ensuring we do not pass NULL to strlen()
   (@thekid)
 

src/main/php/lang/ast/nodes/MatchCondition.class.php

@@ -19,8 +19,6 @@ public function children() {
     foreach ($this->expressions as $expression) {
       yield $expression;
     }
-    foreach ($this->body as $node) {
-      yield $node;
-    }
+    yield $this->body;
   }
 }

src/main/php/lang/ast/nodes/MatchExpression.class.php

@@ -21,9 +21,10 @@ public function __construct($expression, $cases, $default, $line= -1) {
 
   /** @return iterable */
   public function children() {
-    yield $this->expression;
+    if (null !== $this->expression) yield $this->expression;
     foreach ($this->cases as $element) {
       yield $element;
     }
+    if (null !== $this->default) yield $this->default;
   }
 }

src/test/php/lang/ast/unittest/parse/MatchExpressionTest.class.php

@@ -1,6 +1,6 @@
 <?php namespace lang\ast\unittest\parse;
 
-use lang\ast\nodes\{MatchExpression, MatchCondition, Literal, Variable};
+use lang\ast\nodes\{MatchExpression, MatchCondition, Literal, Variable, Block, ReturnStatement};
 use unittest\{Assert, Test};
 
 class MatchExpressionTest extends ParseTest {
@@ -25,6 +25,15 @@ public function match() {
     );
   }
 
+  #[Test]
+  public function match_with_block() {
+    $default= new Block([new ReturnStatement(new Literal('false', self::LINE), self::LINE)], self::LINE);
+    $this->assertParsed(
+      [new MatchExpression(new Variable('arg', self::LINE), [], $default, self::LINE)],
+      'match ($arg) { default => { return false; } };'
+    );
+  }
+
   #[Test]
   public function match_without_condition() {
     $this->assertParsed(