Rename callable "arguments" to "parameters" and make type optional

Author: Kirill Nesmeyanov

resources/grammar.php

@@ -249,18 +249,18 @@
         48 => function (\Phplrt\Parser\Context $ctx, $children) {
             $name = \array_shift($children);
 
-        $arguments = isset($children[0]) && $children[0] instanceof Node\Stmt\Callable\ArgumentsListNode
+        $parameters = isset($children[0]) && $children[0] instanceof Node\Stmt\Callable\ParametersListNode
             ? \array_shift($children)
-            : new Node\Stmt\Callable\ArgumentsListNode();
+            : new Node\Stmt\Callable\ParametersListNode();
 
         return new Node\Stmt\CallableTypeNode(
             name: $name,
-            arguments: $arguments,
+            parameters: $parameters,
             type: isset($children[0]) ? $children[0] : null,
         );
         },
         42 => function (\Phplrt\Parser\Context $ctx, $children) {
-            return new Node\Stmt\Callable\ArgumentsListNode($children);
+            return new Node\Stmt\Callable\ParametersListNode($children);
         },
         49 => function (\Phplrt\Parser\Context $ctx, $children) {
             $token = $ctx->getToken();
@@ -293,7 +293,7 @@
             return $children[0];
         }
 
-        if ($children[0] instanceof Node\Stmt\Callable\ArgumentNode) {
+        if ($children[0] instanceof Node\Stmt\Callable\ParameterNode) {
             $children[0]->variadic = true;
             return $children[0];
         }
@@ -302,7 +302,7 @@
         return $children[1];
         },
         60 => function (\Phplrt\Parser\Context $ctx, $children) {
-            $argument = new Node\Stmt\Callable\ArgumentNode($children[0]);
+            $argument = new Node\Stmt\Callable\ParameterNode($children[0]);
 
         if (\count($children) !== 1) {
             $argument->output = true;

resources/grammar/callable.pp2

@@ -2,30 +2,30 @@
 CallableType -> {
     $name = \array_shift($children);
 
-    $arguments = isset($children[0]) && $children[0] instanceof Node\Stmt\Callable\ArgumentsListNode
+    $parameters = isset($children[0]) && $children[0] instanceof Node\Stmt\Callable\ParametersListNode
         ? \array_shift($children)
-        : new Node\Stmt\Callable\ArgumentsListNode();
+        : new Node\Stmt\Callable\ParametersListNode();
 
     return new Node\Stmt\CallableTypeNode(
         name: $name,
-        arguments: $arguments,
+        parameters: $parameters,
         type: isset($children[0]) ? $children[0] : null,
     );
 }
   : Name()
     ::T_PARENTHESIS_OPEN::
-        CallableArguments()?
+        CallableParameters()?
     ::T_PARENTHESIS_CLOSE::
     CallableReturnType()?
   ;
 
-CallableArguments -> {
-    return new Node\Stmt\Callable\ArgumentsListNode($children);
+CallableParameters -> {
+    return new Node\Stmt\Callable\ParametersListNode($children);
 }
-  : OptionalCallableArgument() (::T_COMMA:: OptionalCallableArgument())* ::T_COMMA::?
+  : OptionalCallableParameter() (::T_COMMA:: OptionalCallableParameter())* ::T_COMMA::?
   ;
 
-OptionalCallableArgument -> {
+OptionalCallableParameter -> {
     if (!isset($children[1])) {
         return $children[0];
     }
@@ -41,39 +41,39 @@ OptionalCallableArgument -> {
     $children[0]->optional = true;
     return $children[0];
 }
-  : NamedCallableArgument() <T_ASSIGN>?
+  : NamedCallableParameter() <T_ASSIGN>?
   ;
 
-NamedCallableArgument -> {
+NamedCallableParameter -> {
     if (\count($children) === 1) {
         return $children[0];
     }
 
     $children[0]->name = $children[1];
     return $children[0];
 }
-  : VariadicCallableArgument() VariableLiteral()?
+  : VariadicCallableParameter() VariableLiteral()?
   ;
 
-VariadicCallableArgument -> {
+VariadicCallableParameter -> {
     if (!isset($children[1])) {
         return $children[0];
     }
 
-    if ($children[0] instanceof Node\Stmt\Callable\ArgumentNode) {
+    if ($children[0] instanceof Node\Stmt\Callable\ParameterNode) {
         $children[0]->variadic = true;
         return $children[0];
     }
 
     $children[1]->variadic = true;
     return $children[1];
 }
-  : <T_ELLIPSIS> OutputCallableArgument()   // Prefixed variadic argument (Psalm format)
-  | OutputCallableArgument() <T_ELLIPSIS>?  // Suffixed variadic argument (PhpStan + Psalm)
+  : <T_ELLIPSIS> OutputCallableParameter()   // Prefixed variadic argument (Psalm format)
+  | OutputCallableParameter() <T_ELLIPSIS>?  // Suffixed variadic argument (PhpStan + Psalm)
   ;
 
-OutputCallableArgument -> {
-    $argument = new Node\Stmt\Callable\ArgumentNode($children[0]);
+OutputCallableParameter -> {
+    $argument = new Node\Stmt\Callable\ParameterNode($children[0]);
 
     if (\count($children) !== 1) {
         $argument->output = true;

src/Node/Stmt/Callable/ArgumentNode.php src/Node/Stmt/Callable/ParameterNode.phpsrc/Node/Stmt/Callable/ArgumentNode.php renamed to src/Node/Stmt/Callable/ParameterNode.php

@@ -8,10 +8,10 @@
 use TypeLang\Parser\Node\Node;
 use TypeLang\Parser\Node\Stmt\TypeStatement;
 
-final class ArgumentNode extends Node implements \Stringable
+final class ParameterNode extends Node implements \Stringable
 {
     public function __construct(
-        public readonly TypeStatement $type,
+        public ?TypeStatement $type = null,
         public ?VariableLiteralNode $name = null,
         public bool $output = false,
         public bool $variadic = false,
@@ -23,7 +23,7 @@ public function is(string $class): bool
         return $this instanceof $class;
     }
 
-    public function getType(): TypeStatement
+    public function getType(): ?TypeStatement
     {
         return $this->type;
     }

…Node/Stmt/Callable/ArgumentsListNode.php …ode/Stmt/Callable/ParametersListNode.phpsrc/Node/Stmt/Callable/ArgumentsListNode.php renamed to src/Node/Stmt/Callable/ParametersListNode.php src/Node/Stmt/Callable/ArgumentsListNode.php renamed to src/Node/Stmt/Callable/ParametersListNode.php

@@ -7,6 +7,6 @@
 use TypeLang\Parser\Node\NodeList;
 
 /**
- * @template-extends NodeList<ArgumentNode>
+ * @template-extends NodeList<ParameterNode>
  */
-class ArgumentsListNode extends NodeList {}
+class ParametersListNode extends NodeList {}

src/Node/Stmt/CallableTypeNode.php

@@ -5,13 +5,13 @@
 namespace TypeLang\Parser\Node\Stmt;
 
 use TypeLang\Parser\Node\Name;
-use TypeLang\Parser\Node\Stmt\Callable\ArgumentsListNode;
+use TypeLang\Parser\Node\Stmt\Callable\ParametersListNode;
 
 class CallableTypeNode extends TypeStatement
 {
     public function __construct(
         public readonly Name $name,
-        public readonly ArgumentsListNode $arguments = new ArgumentsListNode(),
+        public readonly ParametersListNode $parameters = new ParametersListNode(),
         public readonly ?TypeStatement $type = null,
     ) {}
 }