added support for Partial Function Application WIP

Author: dg

src/Latte/Compiler/Nodes/Php/ArgumentPlaceholderNode.php

@@ -0,0 +1,38 @@
+<?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\Node;
+use Latte\Compiler\Position;
+use Latte\Compiler\PrintContext;
+
+
+class ArgumentPlaceholderNode extends Node
+{
+	public function __construct(
+		public ?IdentifierNode $name = null,
+		public ?Position $position = null,
+	) {
+	}
+
+
+	public function print(PrintContext $context): string
+	{
+		return ($this->name ? $this->name . ': ' : '') . '?';
+	}
+
+
+	public function &getIterator(): \Generator
+	{
+		if ($this->name) {
+			yield $this->name;
+		}
+	}
+}

src/Latte/Compiler/Nodes/Php/Expression/FunctionCallNode.php

@@ -21,24 +21,23 @@ class FunctionCallNode extends ExpressionNode
 {
 	public function __construct(
 		public NameNode|ExpressionNode $name,
-		/** @var array<Php\ArgumentNode|Php\VariadicPlaceholderNode> */
+		/** @var array<Php\ArgumentNode|Php\VariadicPlaceholderNode|Php\ArgumentPlaceholderNode> */
 		public array $args = [],
 		public ?Position $position = null,
 	) {
-		(function (Php\ArgumentNode|Php\VariadicPlaceholderNode ...$args) {})(...$args);
+		(function (Php\ArgumentNode|Php\VariadicPlaceholderNode|Php\ArgumentPlaceholderNode ...$args) {})(...$args);
 	}
 
 
 	public function isPartialFunction(): bool
 	{
-		return ($this->args[0] ?? null) instanceof Php\VariadicPlaceholderNode;
+		return Helpers::isPartialFunction($this->args);
 	}
 
 
 	public function print(PrintContext $context): string
 	{
-		return $context->callExpr($this->name)
-			. '(' . $context->implode($this->args) . ')';
+		return $context->callPartial($context->callExpr($this->name), $this->args);
 	}
 
 

src/Latte/Compiler/Nodes/Php/Expression/MethodCallNode.php

@@ -23,18 +23,18 @@ class MethodCallNode extends ExpressionNode
 	public function __construct(
 		public ExpressionNode $object,
 		public IdentifierNode|ExpressionNode $name,
-		/** @var array<Php\ArgumentNode|Php\VariadicPlaceholderNode> */
+		/** @var array<Php\ArgumentNode|Php\VariadicPlaceholderNode|Php\ArgumentPlaceholderNode> */
 		public array $args = [],
 		public bool $nullsafe = false,
 		public ?Position $position = null,
 	) {
-		(function (Php\ArgumentNode|Php\VariadicPlaceholderNode ...$args) {})(...$args);
+		(function (Php\ArgumentNode|Php\VariadicPlaceholderNode|Php\ArgumentPlaceholderNode ...$args) {})(...$args);
 	}
 
 
 	public function isPartialFunction(): bool
 	{
-		return ($this->args[0] ?? null) instanceof Php\VariadicPlaceholderNode;
+		return Helpers::isPartialFunction($this->args);
 	}
 
 
@@ -43,10 +43,12 @@ public function print(PrintContext $context): string
 		if ($this->nullsafe && $this->isPartialFunction()) {
 			throw new CompileException('Cannot combine nullsafe operator with Closure creation', $this->position);
 		}
-		return $context->dereferenceExpr($this->object)
-			. ($this->nullsafe ? '?->' : '->')
-			. $context->objectProperty($this->name)
-			. '(' . $context->implode($this->args) . ')';
+		return $context->callPartial(
+			$context->dereferenceExpr($this->object)
+				. ($this->nullsafe ? '?->' : '->')
+				. $context->objectProperty($this->name),
+			$this->args,
+		);
 	}
 
 

src/Latte/Compiler/Nodes/Php/Expression/StaticMethodCallNode.php

@@ -23,17 +23,17 @@ class StaticMethodCallNode extends ExpressionNode
 	public function __construct(
 		public NameNode|ExpressionNode $class,
 		public IdentifierNode|ExpressionNode $name,
-		/** @var array<Php\ArgumentNode|Php\VariadicPlaceholderNode> */
+		/** @var array<Php\ArgumentNode|Php\VariadicPlaceholderNode|Php\ArgumentPlaceholderNode> */
 		public array $args = [],
 		public ?Position $position = null,
 	) {
-		(function (Php\ArgumentNode|Php\VariadicPlaceholderNode ...$args) {})(...$args);
+		(function (Php\ArgumentNode|Php\VariadicPlaceholderNode|Php\ArgumentPlaceholderNode ...$args) {})(...$args);
 	}
 
 
 	public function isPartialFunction(): bool
 	{
-		return ($this->args[0] ?? null) instanceof Php\VariadicPlaceholderNode;
+		return Helpers::isPartialFunction($this->args);
 	}
 
 
@@ -44,10 +44,10 @@ public function print(PrintContext $context): string
 			$this->name instanceof ExpressionNode => '{' . $this->name->print($context) . '}',
 			default => $this->name,
 		};
-		return $context->dereferenceExpr($this->class)
-			. '::'
-			. $name
-			. '(' . $context->implode($this->args) . ')';
+		return $context->callPartial(
+			$context->dereferenceExpr($this->class) . '::' . $name,
+			$this->args,
+		);
 	}
 
 

src/Latte/Compiler/PrintContext.php

@@ -238,6 +238,30 @@ public function callExpr(Node $expr): string
 	}
 
 
+	public function callPartial(string $expr, array $args): string
+	{
+		$params = $pArgs = [];
+		foreach ($args as $arg) {
+			if ($arg instanceof Nodes\ArgumentNode) {
+				$pArgs[] = $arg->print($this);
+			} elseif ($arg instanceof Nodes\VariadicPlaceholderNode) {
+				if (!$pArgs) {
+					$pArgs[] = '...';
+				} else {
+					$params[] = $var = '$__' . count($params);
+					$pArgs[] = '...' . $var;
+				}
+			} elseif ($arg instanceof Nodes\ArgumentPlaceholderNode) {
+				$params[] = $var = '$__' . count($params);
+				$pArgs[] = ($arg->name ? $arg->name . ': ' : '') . $var;
+			}
+		}
+
+		$expr .= '(' . implode(', ', $pArgs) . ')';
+		return $params ? '(static fn(' . implode(', ', $params) . ') => ' . $expr . ')' : $expr;
+	}
+
+
 	/**
 	 * Wraps the LHS of a dereferencing operation in parentheses if needed.
 	 */