Improve some other statements and remove old deprecated classes

Author: SerafimArts

libs/parser/resources/grammar.php

@@ -427,7 +427,7 @@
                 throw FeatureNotAllowedException::fromFeature('callable types', $offset);
             }
 
-            $parameters = isset($children[0]) && $children[0] instanceof Node\Stmt\Callable\ParametersListNode
+            $parameters = isset($children[0]) && $children[0] instanceof Node\Stmt\Callable\CallableParametersListNode
                 ? \array_shift($children)
                 : new Node\Stmt\Callable\CallableParametersListNode();
 
@@ -558,7 +558,7 @@
 
             foreach ($children as $field) {
                 if ($field instanceof Node\Stmt\Shape\ExplicitFieldNode) {
-                    $key = $field->getKey();
+                    $key = $field->index;
 
                     if (\in_array($key, $explicit, true)) {
                         throw SemanticException::fromShapeFieldDuplication($key, $field->offset);
@@ -590,7 +590,7 @@
 
             $parameters = null;
 
-            if (\end($children) instanceof Node\Stmt\Template\ArgumentsListNode) {
+            if (\end($children) instanceof Node\Stmt\Template\TemplateArgumentsListNode) {
                 $parameters = \array_pop($children);
             }
 
@@ -651,7 +651,7 @@
             }
 
             // Template parameters
-            if (\end($children) instanceof Node\Stmt\Template\ArgumentsListNode) {
+            if (\end($children) instanceof Node\Stmt\Template\TemplateArgumentsListNode) {
                 $parameters = \array_pop($children);
             }
 

libs/parser/resources/grammar/callable.pp2

@@ -6,7 +6,7 @@ CallableType -> {
         throw FeatureNotAllowedException::fromFeature('callable types', $offset);
     }
 
-    $parameters = isset($children[0]) && $children[0] instanceof Node\Stmt\Callable\ParametersListNode
+    $parameters = isset($children[0]) && $children[0] instanceof Node\Stmt\Callable\CallableParametersListNode
         ? \array_shift($children)
         : new Node\Stmt\Callable\CallableParametersListNode();
 

libs/parser/resources/grammar/named-type.pp2

@@ -8,7 +8,7 @@ NamedType -> {
     }
 
     // Template parameters
-    if (\end($children) instanceof Node\Stmt\Template\ArgumentsListNode) {
+    if (\end($children) instanceof Node\Stmt\Template\TemplateArgumentsListNode) {
         $parameters = \array_pop($children);
     }
 

libs/parser/resources/grammar/shape-fields.pp2

@@ -10,7 +10,7 @@ ShapeFields -> {
 
     $parameters = null;
 
-    if (\end($children) instanceof Node\Stmt\Template\ArgumentsListNode) {
+    if (\end($children) instanceof Node\Stmt\Template\TemplateArgumentsListNode) {
         $parameters = \array_pop($children);
     }
 
@@ -43,7 +43,7 @@ ShapeFieldsList -> {
 
     foreach ($children as $field) {
         if ($field instanceof Node\Stmt\Shape\ExplicitFieldNode) {
-            $key = $field->getKey();
+            $key = $field->index;
 
             if (\in_array($key, $explicit, true)) {
                 throw SemanticException::fromShapeFieldDuplication($key, $field->offset);

libs/parser/src/Node/NodeList.php

@@ -19,6 +19,22 @@ abstract class NodeList extends Node implements
      */
     public array $items = [];
 
+    /**
+     * @var TNode|null
+     */
+    public ?Node $first {
+        get => $this->items[0] ?? null;
+    }
+
+    /**
+     * @var TNode|null
+     */
+    public ?Node $last {
+        get => ($lastKey = \array_key_last($this->items)) !== null
+            ? $this->items[$lastKey]
+            : null;
+    }
+
     /**
      * @param iterable<mixed, TNode> $items
      */
@@ -49,26 +65,6 @@ public function findIndex(Node $node): ?int
         return null;
     }
 
-    /**
-     * @return TNode|null
-     */
-    public function first(): ?Node
-    {
-        $first = \reset($this->items);
-
-        return $first instanceof Node ? $first : null;
-    }
-
-    /**
-     * @return TNode|null
-     */
-    public function last(): ?Node
-    {
-        $last = \end($this->items);
-
-        return $last instanceof Node ? $last : null;
-    }
-
     public function offsetExists(mixed $offset): bool
     {
         // @phpstan-ignore-next-line

libs/parser/src/Node/Stmt/Attribute/AttributeGroupNode.php

@@ -9,4 +9,4 @@
 /**
  * @template-extends NodeList<AttributeNode>
  */
-final class AttributeGroupNode extends NodeList {}
+class AttributeGroupNode extends NodeList {}

libs/parser/src/Node/Stmt/Attribute/AttributeGroupsListNode.php

@@ -9,4 +9,4 @@
 /**
  * @template-extends NodeList<AttributeGroupNode>
  */
-final class AttributeGroupsListNode extends NodeList {}
+class AttributeGroupsListNode extends NodeList {}

libs/parser/src/Node/Stmt/Attribute/AttributeNode.php

@@ -7,7 +7,7 @@
 use TypeLang\Parser\Node\Name;
 use TypeLang\Parser\Node\Node;
 
-final class AttributeNode extends Node
+class AttributeNode extends Node
 {
     public function __construct(
         public Name $name,

libs/parser/src/Node/Stmt/Callable/CallableParameterNode.php

@@ -4,4 +4,50 @@
 
 namespace TypeLang\Parser\Node\Stmt\Callable;
 
-class CallableParameterNode extends ParameterNode {}
+use TypeLang\Parser\Node\Literal\VariableLiteralNode;
+use TypeLang\Parser\Node\Node;
+use TypeLang\Parser\Node\Stmt\Attribute\AttributeGroupsListNode;
+use TypeLang\Parser\Node\Stmt\TypeStatement;
+
+class CallableParameterNode extends Node implements \Stringable
+{
+    public function __construct(
+        public ?TypeStatement $type = null,
+        public ?VariableLiteralNode $name = null,
+        public bool $output = false,
+        public bool $variadic = false,
+        public bool $optional = false,
+        public ?AttributeGroupsListNode $attributes = null,
+    ) {
+        assert($type !== null || $name !== null, new \TypeError(
+            'Required indication of the type or name of the parameter (one of)',
+        ));
+
+        assert($variadic === false || $optional === false, new \TypeError(
+            'Parameter cannot be both variable and optional (variadic parameter is already optional)',
+        ));
+    }
+
+    public function __toString(): string
+    {
+        $result = [];
+
+        if ($this->output) {
+            $result[] = 'output';
+        }
+
+        if ($this->variadic) {
+            $result[] = 'variadic';
+        }
+
+        if ($this->optional) {
+            $result[] = 'optional';
+        }
+
+        if ($result === []) {
+            return 'simple';
+        }
+
+        return \implode(', ', $result);
+    }
+}

libs/parser/src/Node/Stmt/Callable/CallableParametersListNode.php

@@ -4,7 +4,9 @@
 
 namespace TypeLang\Parser\Node\Stmt\Callable;
 
+use TypeLang\Parser\Node\NodeList;
+
 /**
- * @template-extends ParametersListNode<CallableParameterNode>
+ * @template-extends NodeList<CallableParameterNode>
  */
-class CallableParametersListNode extends ParametersListNode {}
+class CallableParametersListNode extends NodeList {}