ParametersNode & DefineNode parses parameters as ParameterNode[] with…

… full type
nette · May 18, 2022 · 8742292 · 8742292
1 parent 987bcd8
commit 8742292
Show file tree

Hide file tree

Showing 9 changed files with 57 additions and 20 deletions.
diff --git a/src/Latte/Compiler/Block.php b/src/Latte/Compiler/Block.php
@@ -10,8 +10,8 @@
 namespace Latte\Compiler;
 
 use Latte;
-use Latte\Compiler\Nodes\Php\Expression;
 use Latte\Compiler\Nodes\Php\ExpressionNode;
+use Latte\Compiler\Nodes\Php\ParameterNode;
 use Latte\Compiler\Nodes\Php\Scalar;
 
 
@@ -24,7 +24,7 @@ final class Block
 	public string $content;
 	public string $escaping;
 
-	/** @var Expression\AssignNode[] */
+	/** @var ParameterNode[] */
 	public array $parameters = [];
 
 

diff --git a/src/Latte/Compiler/Nodes/Php/SuperiorTypeNode.php b/src/Latte/Compiler/Nodes/Php/SuperiorTypeNode.php
@@ -0,0 +1,29 @@
+<?php
+
+/**
+ * This file is part of the Latte (https://latte.nette.org)
+ * Copyright (c) 2008 David Grudl (https://davidgrudl.com)
+ */
+
+declare(strict_types=1);
+
+namespace Latte\Compiler\Nodes\Php;
+
+use Latte\Compiler\Position;
+use Latte\Compiler\PrintContext;
+
+
+class SuperiorTypeNode extends ComplexTypeNode
+{
+	public function __construct(
+		public string $type,
+		public ?Position $position = null,
+	) {
+	}
+
+
+	public function print(PrintContext $context): string
+	{
+		throw new \LogicException('Cannot directly print SuperiorTypeNode');
+	}
+}
diff --git a/src/Latte/Compiler/TagParser.php b/src/Latte/Compiler/TagParser.php
@@ -101,7 +101,7 @@ public function tryConsumeModifier(string ...$modifiers): ?Token
 	}
 
 
-	public function parseType(): ?string
+	public function parseType(): ?Node\SuperiorTypeNode
 	{
 		$kind = [
 			Token::Php_Identifier, Token::Php_Constant, Token::Php_Ellipsis, Token::Php_Array, Token::Php_Integer,
@@ -113,7 +113,7 @@ public function parseType(): ?string
 			$res .= $token->text;
 		}
 
-		return $res;
+		return $res ? new Node\SuperiorTypeNode($res) : null;
 	}
 
 

diff --git a/src/Latte/Compiler/TemplateGenerator.php b/src/Latte/Compiler/TemplateGenerator.php
@@ -127,20 +127,21 @@ private function buildParams(string $body, array $params, string $cont, PrintCon
 			return $body;
 		}
 
-		foreach ($params as $i => &$param) {
-			$param = $context->format(
+		$res = [];
+		foreach ($params as $i => $param) {
+			$res[] = $context->format(
 				'%node = %raw[%dump] ?? %raw[%dump] ?? %node;',
 				$param->var,
 				$cont,
 				$i,
 				$cont,
 				$param->var->name,
-				$param->expr,
+				$param->default,
 			);
 		}
 
 		$extract = $params
-			? implode('', $params) . 'unset($ʟ_args);'
+			? implode('', $res) . 'unset($ʟ_args);'
 			: "extract($cont);" . (str_contains($cont, '$this') ? '' : "unset($cont);");
 		return $extract . "\n\n" . $body;
 	}

diff --git a/src/Latte/Essential/Nodes/DefineNode.php b/src/Latte/Essential/Nodes/DefineNode.php
@@ -13,6 +13,7 @@
 use Latte\Compiler\Nodes\AreaNode;
 use Latte\Compiler\Nodes\Php\Expression\AssignNode;
 use Latte\Compiler\Nodes\Php\Expression\VariableNode;
+use Latte\Compiler\Nodes\Php\ParameterNode;
 use Latte\Compiler\Nodes\Php\Scalar;
 use Latte\Compiler\Nodes\StatementNode;
 use Latte\Compiler\PrintContext;
@@ -64,18 +65,18 @@ private static function parseParameters(Tag $tag): array
 		$stream = $tag->parser->stream;
 		$params = [];
 		while (!$stream->is(Token::End)) {
-			$tag->parser->parseType();
+			$type = $tag->parser->parseType();
 
 			$save = $stream->getIndex();
 			$expr = $stream->is(Token::Php_Variable) ? $tag->parser->parseExpression() : null;
 			if ($expr instanceof VariableNode && is_string($expr->name)) {
-				$params[] = new AssignNode($expr, new Scalar\NullNode);
+				$params[] = new ParameterNode($expr, new Scalar\NullNode, $type);
 			} elseif (
 				$expr instanceof AssignNode
 				&& $expr->var instanceof VariableNode
 				&& is_string($expr->var->name)
 			) {
-				$params[] = $expr;
+				$params[] = new ParameterNode($expr->var, $expr->expr, $type);
 			} else {
 				$stream->seek($save);
 				$stream->throwUnexpectedException(addendum: ' in ' . $tag->getNotation());

diff --git a/src/Latte/Essential/Nodes/ParametersNode.php b/src/Latte/Essential/Nodes/ParametersNode.php
@@ -12,6 +12,7 @@
 use Latte\CompileException;
 use Latte\Compiler\Nodes\Php\Expression\AssignNode;
 use Latte\Compiler\Nodes\Php\Expression\VariableNode;
+use Latte\Compiler\Nodes\Php\ParameterNode;
 use Latte\Compiler\Nodes\Php\Scalar\NullNode;
 use Latte\Compiler\Nodes\StatementNode;
 use Latte\Compiler\PrintContext;
@@ -24,7 +25,7 @@
  */
 class ParametersNode extends StatementNode
 {
-	/** @var AssignNode[] */
+	/** @var ParameterNode[] */
 	public array $parameters = [];
 
 
@@ -45,18 +46,18 @@ private static function parseParameters(Tag $tag): array
 		$stream = $tag->parser->stream;
 		$params = [];
 		do {
-			$tag->parser->parseType();
+			$type = $tag->parser->parseType();
 
 			$save = $stream->getIndex();
 			$expr = $stream->is(Token::Php_Variable) ? $tag->parser->parseExpression() : null;
 			if ($expr instanceof VariableNode && is_string($expr->name)) {
-				$params[] = new AssignNode($expr, new NullNode);
+				$params[] = new ParameterNode($expr, new NullNode, $type);
 			} elseif (
 				$expr instanceof AssignNode
 				&& $expr->var instanceof VariableNode
 				&& is_string($expr->var->name)
 			) {
-				$params[] = $expr;
+				$params[] = new ParameterNode($expr->var, $expr->expr, $type);
 			} else {
 				$stream->seek($save);
 				$stream->throwUnexpectedException(addendum: ' in ' . $tag->getNotation());

diff --git a/tests/helpers.php b/tests/helpers.php
@@ -127,6 +127,7 @@ public function export(?Node $node = null)
 			$node instanceof Nodes\Html\ElementNode,
 				$node instanceof Nodes\Php\IdentifierNode => 'name: ' . $node->name,
 			$node instanceof Nodes\Php\NameNode => 'parts: ' . PhpHelpers::dump($node->parts),
+			$node instanceof Nodes\Php\SuperiorTypeNode => PhpHelpers::dump($node->type),
 			$node instanceof Nodes\Php\Scalar\FloatNode,
 				$node instanceof Nodes\Php\Scalar\EncapsedStringPartNode,
 				$node instanceof Nodes\Php\Scalar\IntegerNode,

diff --git a/tests/tags/define.nodes.phpt b/tests/tags/define.nodes.phpt
@@ -18,11 +18,13 @@ Assert::match(<<<'XX'
 			Define:
 				String:
 					value: test
-				Assign:
+				Parameter:
+					SuperiorType:
+						'int'
 					Variable:
 						name: a
 					Null:
-				Assign:
+				Parameter:
 					Variable:
 						name: b
 					New:
@@ -31,4 +33,4 @@ Assert::match(<<<'XX'
 				Fragment:
 					Text:
 						content: '...'
-	XX, exportTraversing('{define test, $a, $b = new Foo}...{/define}'));
+	XX, exportTraversing('{define test, int $a, $b = new Foo}...{/define}'));
diff --git a/tests/tags/parameters.nodes.phpt b/tests/tags/parameters.nodes.phpt
@@ -15,11 +15,13 @@ Assert::match(<<<'XX'
 	Template:
 		Fragment:
 			Parameters:
-				Assign:
+				Parameter:
 					Variable:
 						name: b
 					Null:
-				Assign:
+				Parameter:
+					SuperiorType:
+						'int'
 					Variable:
 						name: a
 					Integer: