Added feature of template argument hints like "type<covariant T>"

Author: SerafimArts

composer.json

@@ -28,6 +28,7 @@
         "phplrt/compiler": "^3.5",
         "phpunit/phpunit": "^10.5",
         "rector/rector": "^0.18",
+        "symfony/var-dumper": "^5.6|^6.0|^7.0",
         "vimeo/psalm": "^5.18"
     },
     "autoload-dev": {

resources/grammar.php

@@ -20,7 +20,14 @@ Identifier -> {
     return new Node\Identifier($children->getValue());
 }
   : <T_NAME>
+  | <T_NAME_WITH_SPACE>
   | <T_EQ>
   | <T_BOOL_LITERAL>
   | <T_NULL_LITERAL>
   ;
+
+IdentifierWithExtraSpace -> {
+    return new Node\Identifier($children->getValue());
+}
+    : <T_NAME_WITH_SPACE>
+    ;

resources/grammar/common.pp2

@@ -18,6 +18,7 @@
 %token  T_NEQ                   (?i)is\h+not(?![a-zA-Z0-9\-_\x80-\xff])
 %token  T_EQ                    (?i)is(?![a-zA-Z0-9\-_\x80-\xff])
 %token  T_VARIABLE              \$[a-zA-Z_\x80-\xff][a-zA-Z0-9\-_\x80-\xff]*
+%token  T_NAME_WITH_SPACE       [a-zA-Z_\x80-\xff][a-zA-Z0-9\-_\x80-\xff]*\s+?
 %token  T_NAME                  [a-zA-Z_\x80-\xff][a-zA-Z0-9\-_\x80-\xff]*
 
 // Special Chars

resources/grammar/lexemes.pp2

@@ -11,8 +11,18 @@ TemplateArguments -> {
 
 TemplateArgument -> {
     return new Node\Stmt\Template\ArgumentNode(
-        \is_array($children) ? $children[0] : $children,
+        \array_pop($children),
+        $children[0] ?? null,
     );
 }
+  : TemplateHintedArgument()
+  | TemplateSimpleArgument()
+  ;
+
+TemplateSimpleArgument
   : Type()
   ;
+
+TemplateHintedArgument
+  : IdentifierWithExtraSpace() Type()
+  ;

resources/grammar/template-arguments.pp2

@@ -35,14 +35,20 @@ final class Identifier extends Node implements \Stringable
         'false',
     ];
 
+    /**
+     * @var non-empty-string
+     */
+    public readonly string $value;
+
     /**
      * @param non-empty-string $value
      *
      * @psalm-suppress RedundantCondition
      */
-    public function __construct(
-        public readonly string $value,
-    ) {
+    public function __construct(string $value)
+    {
+        $this->value = \trim($value);
+
         assert($this->value !== '', new \InvalidArgumentException(
             'Identifier value cannot be empty',
         ));

src/Node/Identifier.php

@@ -4,13 +4,15 @@
 
 namespace TypeLang\Parser\Node\Stmt\Template;
 
+use TypeLang\Parser\Node\Identifier;
 use TypeLang\Parser\Node\Node;
 use TypeLang\Parser\Node\Stmt\TypeStatement;
 
 class ArgumentNode extends Node
 {
     public function __construct(
-        public TypeStatement $value
+        public TypeStatement $value,
+        public ?Identifier $hint = null,
     ) {}
 
     public function toArray(): array