yield can retun null

dg · dg · commit 30c15112485b · 2022-12-21T14:45:06.000+01:00
diff --git a/src/Latte/Compiler/Node.php b/src/Latte/Compiler/Node.php
@@ -22,7 +22,6 @@ abstract public function print(PrintContext $context): string;
 
 	public function &getIterator(): \Generator
 	{
-		return;
 		yield;
 	}
 }
diff --git a/src/Latte/Compiler/NodeTraverser.php b/src/Latte/Compiler/NodeTraverser.php
@@ -56,6 +56,9 @@ private function traverseNode(Node $node): Node
 
 		if ($children) {
 			foreach ($node as &$subnode) {
+				if ($subnode === null) {
+					continue;
+				}
 				$subnode = $this->traverseNode($subnode);
 				if ($this->stop) {
 					break;
diff --git a/src/Latte/Compiler/Nodes/AuxiliaryNode.php b/src/Latte/Compiler/Nodes/AuxiliaryNode.php
@@ -28,6 +28,6 @@ public function print(PrintContext $context): string
 
 	public function &getIterator(): \Generator
 	{
-		false && yield;
+		yield;
 	}
 }
diff --git a/src/Latte/Compiler/Nodes/Html/AttributeNode.php b/src/Latte/Compiler/Nodes/Html/AttributeNode.php
@@ -41,8 +41,6 @@ public function print(PrintContext $context): string
 	public function &getIterator(): \Generator
 	{
 		yield $this->name;
-		if ($this->value) {
-			yield $this->value;
-		}
+		yield $this->value;
 	}
 }
diff --git a/src/Latte/Compiler/Nodes/Html/ElementNode.php b/src/Latte/Compiler/Nodes/Html/ElementNode.php
@@ -116,14 +116,8 @@ private function printStartTag(PrintContext $context): string
 	public function &getIterator(): \Generator
 	{
 		yield $this->tagNode;
-		if ($this->customName) {
-			yield $this->customName;
-		}
-		if ($this->attributes) {
-			yield $this->attributes;
-		}
-		if ($this->content) {
-			yield $this->content;
-		}
+		yield $this->customName;
+		yield $this->attributes;
+		yield $this->content;
 	}
 }
diff --git a/src/Latte/Compiler/Nodes/NopNode.php b/src/Latte/Compiler/Nodes/NopNode.php
@@ -22,6 +22,6 @@ public function print(PrintContext $context): string
 
 	public function &getIterator(): \Generator
 	{
-		false && yield;
+		yield;
 	}
 }
diff --git a/src/Latte/Compiler/Nodes/Php/ArgumentNode.php b/src/Latte/Compiler/Nodes/Php/ArgumentNode.php
@@ -37,9 +37,7 @@ public function print(PrintContext $context): string
 
 	public function &getIterator(): \Generator
 	{
-		if ($this->name) {
-			yield $this->name;
-		}
+		yield $this->name;
 		yield $this->value;
 	}
 }
diff --git a/src/Latte/Compiler/Nodes/Php/Expression/ArrayAccessNode.php b/src/Latte/Compiler/Nodes/Php/Expression/ArrayAccessNode.php
@@ -34,8 +34,6 @@ public function print(PrintContext $context): string
 	public function &getIterator(): \Generator
 	{
 		yield $this->expr;
-		if ($this->index) {
-			yield $this->index;
-		}
+		yield $this->index;
 	}
 }
diff --git a/src/Latte/Compiler/Nodes/Php/Expression/ArrayItemNode.php b/src/Latte/Compiler/Nodes/Php/Expression/ArrayItemNode.php
@@ -44,9 +44,7 @@ public function print(PrintContext $context): string
 
 	public function &getIterator(): \Generator
 	{
-		if ($this->key) {
-			yield $this->key;
-		}
+		yield $this->key;
 		yield $this->value;
 	}
 }
diff --git a/src/Latte/Compiler/Nodes/Php/Expression/ArrayNode.php b/src/Latte/Compiler/Nodes/Php/Expression/ArrayNode.php
@@ -86,9 +86,7 @@ public function print(PrintContext $context): string
 	public function &getIterator(): \Generator
 	{
 		foreach ($this->items as &$item) {
-			if ($item) {
-				yield $item;
-			}
+			yield $item;
 		}
 	}
 }
diff --git a/src/Latte/Compiler/Nodes/Php/Expression/ClosureNode.php b/src/Latte/Compiler/Nodes/Php/Expression/ClosureNode.php
@@ -63,11 +63,7 @@ public function &getIterator(): \Generator
 			yield $item;
 		}
 
-		if ($this->returnType) {
-			yield $this->returnType;
-		}
-		if ($this->expr) {
-			yield $this->expr;
-		}
+		yield $this->returnType;
+		yield $this->expr;
 	}
 }
diff --git a/src/Latte/Compiler/Nodes/Php/Expression/TernaryNode.php b/src/Latte/Compiler/Nodes/Php/Expression/TernaryNode.php
@@ -40,11 +40,7 @@ public function print(PrintContext $context): string
 	public function &getIterator(): \Generator
 	{
 		yield $this->cond;
-		if ($this->if) {
-			yield $this->if;
-		}
-		if ($this->else) {
-			yield $this->else;
-		}
+		yield $this->if;
+		yield $this->else;
 	}
 }
diff --git a/src/Latte/Compiler/Nodes/Php/IdentifierNode.php b/src/Latte/Compiler/Nodes/Php/IdentifierNode.php
@@ -37,6 +37,6 @@ public function print(PrintContext $context): string
 
 	public function &getIterator(): \Generator
 	{
-		false && yield;
+		yield;
 	}
 }
diff --git a/src/Latte/Compiler/Nodes/Php/NameNode.php b/src/Latte/Compiler/Nodes/Php/NameNode.php
@@ -90,6 +90,6 @@ public function toCodeString(): string
 
 	public function &getIterator(): \Generator
 	{
-		false && yield;
+		yield;
 	}
 }
diff --git a/src/Latte/Compiler/Nodes/Php/ParameterNode.php b/src/Latte/Compiler/Nodes/Php/ParameterNode.php
@@ -43,12 +43,8 @@ public function print(PrintContext $context): string
 
 	public function &getIterator(): \Generator
 	{
-		if ($this->type) {
-			yield $this->type;
-		}
+		yield $this->type;
 		yield $this->var;
-		if ($this->default) {
-			yield $this->default;
-		}
+		yield $this->default;
 	}
 }
diff --git a/src/Latte/Compiler/Nodes/Php/ScalarNode.php b/src/Latte/Compiler/Nodes/Php/ScalarNode.php
@@ -14,6 +14,6 @@ abstract class ScalarNode extends ExpressionNode
 {
 	public function &getIterator(): \Generator
 	{
-		false && yield;
+		yield;
 	}
 }
diff --git a/src/Latte/Compiler/Nodes/Php/SuperiorTypeNode.php b/src/Latte/Compiler/Nodes/Php/SuperiorTypeNode.php
@@ -30,6 +30,6 @@ public function print(PrintContext $context): string
 
 	public function &getIterator(): \Generator
 	{
-		false && yield;
+		yield;
 	}
 }
diff --git a/src/Latte/Compiler/Nodes/TextNode.php b/src/Latte/Compiler/Nodes/TextNode.php
@@ -38,6 +38,6 @@ public function isWhitespace(): bool
 
 	public function &getIterator(): \Generator
 	{
-		false && yield;
+		yield;
 	}
 }
diff --git a/src/Latte/Essential/Nodes/ContentTypeNode.php b/src/Latte/Essential/Nodes/ContentTypeNode.php
@@ -75,6 +75,6 @@ public function print(PrintContext $context): string
 
 	public function &getIterator(): \Generator
 	{
-		false && yield;
+		yield;
 	}
 }
diff --git a/src/Latte/Essential/Nodes/DebugbreakNode.php b/src/Latte/Essential/Nodes/DebugbreakNode.php
@@ -46,8 +46,6 @@ public function print(PrintContext $context): string
 
 	public function &getIterator(): \Generator
 	{
-		if ($this->condition) {
-			yield $this->condition;
-		}
+		yield $this->condition;
 	}
 }
diff --git a/src/Latte/Essential/Nodes/DumpNode.php b/src/Latte/Essential/Nodes/DumpNode.php
@@ -51,8 +51,6 @@ public function print(PrintContext $context): string
 
 	public function &getIterator(): \Generator
 	{
-		if ($this->expression) {
-			yield $this->expression;
-		}
+		yield $this->expression;
 	}
 }
diff --git a/src/Latte/Essential/Nodes/FirstLastSepNode.php b/src/Latte/Essential/Nodes/FirstLastSepNode.php
@@ -70,12 +70,8 @@ public function print(PrintContext $context): string
 
 	public function &getIterator(): \Generator
 	{
-		if ($this->width) {
-			yield $this->width;
-		}
+		yield $this->width;
 		yield $this->then;
-		if ($this->else) {
-			yield $this->else;
-		}
+		yield $this->else;
 	}
 }
diff --git a/src/Latte/Essential/Nodes/ForNode.php b/src/Latte/Essential/Nodes/ForNode.php
@@ -78,9 +78,7 @@ public function &getIterator(): \Generator
 			yield $item;
 		}
 
-		if ($this->condition) {
-			yield $this->condition;
-		}
+		yield $this->condition;
 
 		foreach ($this->next as &$item) {
 			yield $item;
diff --git a/src/Latte/Essential/Nodes/ForeachNode.php b/src/Latte/Essential/Nodes/ForeachNode.php
@@ -143,13 +143,9 @@ private function printArgs(PrintContext $context): string
 	public function &getIterator(): \Generator
 	{
 		yield $this->expression;
-		if ($this->key) {
-			yield $this->key;
-		}
+		yield $this->key;
 		yield $this->value;
 		yield $this->content;
-		if ($this->else) {
-			yield $this->else;
-		}
+		yield $this->else;
 	}
 }
diff --git a/src/Latte/Essential/Nodes/IfChangedNode.php b/src/Latte/Essential/Nodes/IfChangedNode.php
@@ -134,8 +134,6 @@ public function &getIterator(): \Generator
 	{
 		yield $this->conditions;
 		yield $this->then;
-		if ($this->else) {
-			yield $this->else;
-		}
+		yield $this->else;
 	}
 }
diff --git a/src/Latte/Essential/Nodes/IfNode.php b/src/Latte/Essential/Nodes/IfNode.php
@@ -173,8 +173,6 @@ public function &getIterator(): \Generator
 	{
 		yield $this->condition;
 		yield $this->then;
-		if ($this->else) {
-			yield $this->else;
-		}
+		yield $this->else;
 	}
 }
diff --git a/src/Latte/Essential/Nodes/IncludeBlockNode.php b/src/Latte/Essential/Nodes/IncludeBlockNode.php
@@ -131,9 +131,7 @@ private function printBlockFrom(PrintContext $context, string $modArg): string
 	public function &getIterator(): \Generator
 	{
 		yield $this->name;
-		if ($this->from) {
-			yield $this->from;
-		}
+		yield $this->from;
 		yield $this->args;
 		yield $this->modifier;
 	}
diff --git a/src/Latte/Essential/Nodes/RawPhpNode.php b/src/Latte/Essential/Nodes/RawPhpNode.php
@@ -47,6 +47,6 @@ public function print(PrintContext $context): string
 
 	public function &getIterator(): \Generator
 	{
-		false && yield;
+		yield;
 	}
 }
diff --git a/src/Latte/Essential/Nodes/RollbackNode.php b/src/Latte/Essential/Nodes/RollbackNode.php
@@ -38,6 +38,6 @@ public function print(PrintContext $context): string
 
 	public function &getIterator(): \Generator
 	{
-		false && yield;
+		yield;
 	}
 }
diff --git a/src/Latte/Essential/Nodes/SwitchNode.php b/src/Latte/Essential/Nodes/SwitchNode.php
@@ -109,9 +109,7 @@ public function &getIterator(): \Generator
 	{
 		yield $this->expression;
 		foreach ($this->cases as [&$case, , &$stmt]) {
-			if ($case) {
-				yield $case;
-			}
+			yield $case;
 			yield $stmt;
 		}
 	}
diff --git a/src/Latte/Essential/Nodes/TemplatePrintNode.php b/src/Latte/Essential/Nodes/TemplatePrintNode.php
@@ -40,6 +40,6 @@ public function print(PrintContext $context): string
 
 	public function &getIterator(): \Generator
 	{
-		false && yield;
+		yield;
 	}
 }
diff --git a/src/Latte/Essential/Nodes/TemplateTypeNode.php b/src/Latte/Essential/Nodes/TemplateTypeNode.php
@@ -39,6 +39,6 @@ public function print(PrintContext $context): string
 
 	public function &getIterator(): \Generator
 	{
-		false && yield;
+		yield;
 	}
 }
diff --git a/src/Latte/Essential/Nodes/TraceNode.php b/src/Latte/Essential/Nodes/TraceNode.php
@@ -36,6 +36,6 @@ public function print(PrintContext $context): string
 
 	public function &getIterator(): \Generator
 	{
-		false && yield;
+		yield;
 	}
 }
diff --git a/src/Latte/Essential/Nodes/TryNode.php b/src/Latte/Essential/Nodes/TryNode.php
@@ -68,8 +68,6 @@ public function print(PrintContext $context): string
 	public function &getIterator(): \Generator
 	{
 		yield $this->try;
-		if ($this->else) {
-			yield $this->else;
-		}
+		yield $this->else;
 	}
 }
diff --git a/src/Latte/Essential/Nodes/VarPrintNode.php b/src/Latte/Essential/Nodes/VarPrintNode.php
@@ -41,6 +41,6 @@ public function print(PrintContext $context): string
 
 	public function &getIterator(): \Generator
 	{
-		false && yield;
+		yield;
 	}
 }
diff --git a/src/Latte/Essential/Nodes/VarTypeNode.php b/src/Latte/Essential/Nodes/VarTypeNode.php
@@ -37,6 +37,6 @@ public function print(PrintContext $context): string
 
 	public function &getIterator(): \Generator
 	{
-		false && yield;
+		yield;
 	}
 }
diff --git a/tests/helpers.php b/tests/helpers.php
@@ -126,7 +126,9 @@ function exportAST(Node $node)
 	};
 	$res = $prop ? $prop . "\n" : '';
 	foreach ($node as $sub) {
-		$res .= rtrim(exportAST($sub), "\n") . "\n";
+		if ($sub !== null) {
+			$res .= rtrim(exportAST($sub), "\n") . "\n";
+		}
 	}
 
 	return substr($node::class, strrpos($node::class, '\\') + 1, -4)

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,6 @@ abstract public function print(PrintContext $context): string;`
`22`	`22`
`23`	`23`	`public function &getIterator(): \Generator`
`24`	`24`	`{`
`25`		`- return;`
`26`	`25`	`yield;`
`27`	`26`	`}`
`28`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,6 @@ public function print(PrintContext $context): string`
`28`	`28`
`29`	`29`	`public function &getIterator(): \Generator`
`30`	`30`	`{`
`31`		`- false && yield;`
	`31`	`+ yield;`
`32`	`32`	`}`
`33`	`33`	`}`
Original file line number	Diff line number	Diff line change
`@@ -41,8 +41,6 @@ public function print(PrintContext $context): string`
`41`	`41`	`public function &getIterator(): \Generator`
`42`	`42`	`{`
`43`	`43`	`yield $this->name;`
`44`		`- if ($this->value) {`
`45`		`- yield $this->value;`
`46`		`- }`
	`44`	`+ yield $this->value;`
`47`	`45`	`}`
`48`	`46`	`}`
Original file line number	Diff line number	Diff line change
`@@ -116,14 +116,8 @@ private function printStartTag(PrintContext $context): string`
`116`	`116`	`public function &getIterator(): \Generator`
`117`	`117`	`{`
`118`	`118`	`yield $this->tagNode;`
`119`		`- if ($this->customName) {`
`120`		`- yield $this->customName;`
`121`		`- }`
`122`		`- if ($this->attributes) {`
`123`		`- yield $this->attributes;`
`124`		`- }`
`125`		`- if ($this->content) {`
`126`		`- yield $this->content;`
`127`		`- }`
	`119`	`+ yield $this->customName;`
	`120`	`+ yield $this->attributes;`
	`121`	`+ yield $this->content;`
`128`	`122`	`}`
`129`	`123`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,6 @@ public function print(PrintContext $context): string`
`22`	`22`
`23`	`23`	`public function &getIterator(): \Generator`
`24`	`24`	`{`
`25`		`- false && yield;`
	`25`	`+ yield;`
`26`	`26`	`}`
`27`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -37,9 +37,7 @@ public function print(PrintContext $context): string`
`37`	`37`
`38`	`38`	`public function &getIterator(): \Generator`
`39`	`39`	`{`
`40`		`- if ($this->name) {`
`41`		`- yield $this->name;`
`42`		`- }`
	`40`	`+ yield $this->name;`
`43`	`41`	`yield $this->value;`
`44`	`42`	`}`
`45`	`43`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,8 +34,6 @@ public function print(PrintContext $context): string`
`34`	`34`	`public function &getIterator(): \Generator`
`35`	`35`	`{`
`36`	`36`	`yield $this->expr;`
`37`		`- if ($this->index) {`
`38`		`- yield $this->index;`
`39`		`- }`
	`37`	`+ yield $this->index;`
`40`	`38`	`}`
`41`	`39`	`}`
Original file line number	Diff line number	Diff line change
`@@ -44,9 +44,7 @@ public function print(PrintContext $context): string`
`44`	`44`
`45`	`45`	`public function &getIterator(): \Generator`
`46`	`46`	`{`
`47`		`- if ($this->key) {`
`48`		`- yield $this->key;`
`49`		`- }`
	`47`	`+ yield $this->key;`
`50`	`48`	`yield $this->value;`
`51`	`49`	`}`
`52`	`50`	`}`
Original file line number	Diff line number	Diff line change
`@@ -86,9 +86,7 @@ public function print(PrintContext $context): string`
`86`	`86`	`public function &getIterator(): \Generator`
`87`	`87`	`{`
`88`	`88`	`foreach ($this->items as &$item) {`
`89`		`- if ($item) {`
`90`		`- yield $item;`
`91`		`- }`
	`89`	`+ yield $item;`
`92`	`90`	`}`
`93`	`91`	`}`
`94`	`92`	`}`