Optimize and add AST serialization support

Author: Kirill Nesmeyanov

composer.json

@@ -24,11 +24,11 @@
     "require-dev": {
         "nikic/php-parser": "^4.17",
         "phpdocumentor/reflection-docblock": "^5.3",
-        "friendsofphp/php-cs-fixer": "^3.35",
+        "friendsofphp/php-cs-fixer": "^3.42",
         "phplrt/compiler": "^3.5",
-        "phpunit/phpunit": "^10.4",
+        "phpunit/phpunit": "^10.5",
         "rector/rector": "^0.18",
-        "vimeo/psalm": "^5.15"
+        "vimeo/psalm": "^5.18"
     },
     "autoload-dev": {
         "psr-4": {
@@ -37,8 +37,8 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "1.0.x-dev",
-            "dev-main": "1.0.x-dev"
+            "dev-master": "2.0.x-dev",
+            "dev-main": "2.0.x-dev"
         }
     },
     "config": {

phpunit.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.4/phpunit.xsd"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd"
          colors="true"
          backupGlobals="true"
          stopOnFailure="false"

resources/grammar.php

@@ -126,16 +126,9 @@ TypesList -> {
     )*
   ;
 
-ThisType -> {
-    return new Node\Stmt\ThisTypeNode();
-}
-  : <T_THIS>
-  ;
-
 PrimaryType
   : ::T_PARENTHESIS_OPEN:: Type() ::T_PARENTHESIS_CLOSE::
   | Literal()
   | CallableType()
   | NamedType()
-  | ThisType()
   ;

resources/grammar.pp2

@@ -15,7 +15,6 @@
 
 // Identifier
 
-%token  T_THIS                  \$this(?![a-zA-Z0-9\-_\x80-\xff])
 %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]*

resources/grammar/lexemes.pp2

@@ -22,7 +22,6 @@ VariableLiteral -> {
     return Node\Literal\VariableLiteralNode::parse($token->getValue());
 }
   : <T_VARIABLE>
-  | <T_THIS>
   ;
 
 StringLiteral -> { return $this->stringPool[$token] ??= $children; }

resources/grammar/literals.pp2

@@ -43,25 +43,25 @@ ShapeFieldsList -> {
 
     foreach ($children as $field) {
         if ($field instanceof Node\Stmt\Shape\ExplicitFieldNode) {
-            $identifier = $field->getIdentifier();
+            $key = $field->getKey();
 
-            if (\in_array($identifier, $explicit, true)) {
+            if (\in_array($key, $explicit, true)) {
                 throw new SemanticException(
-                    \sprintf('Duplicate key "%s"', $identifier),
+                    \sprintf('Duplicate key "%s"', $key),
                     $field->offset,
                     SemanticException::CODE_SHAPE_KEY_DUPLICATION,
                 );
             }
 
-            $explicit[] = $identifier;
+            $explicit[] = $key;
         } else {
             $implicit = true;
         }
     }
 
     if ($explicit !== [] && $implicit) {
         throw new SemanticException(
-            \sprintf('Cannot mix explicit and implicit shape keys', $identifier),
+            \sprintf('Cannot mix explicit and implicit shape keys', $key),
             $offset,
             SemanticException::CODE_SHAPE_KEY_MIX,
         );
@@ -98,7 +98,7 @@ ExplicitField -> {
   ;
 
 ImplicitField -> {
-    return new Node\Stmt\Shape\FieldNode($children[0]);
+    return new Node\Stmt\Shape\ImplicitFieldNode($children[0]);
 }
   : ShapeValue()
   ;

resources/grammar/shape-fields.pp2

@@ -32,7 +32,7 @@ final class Identifier extends Node implements \Stringable
         'iterable',
         'null',
         'true',
-        'false'
+        'false',
     ];
 
     /**
@@ -106,4 +106,19 @@ public function __toString(): string
     {
         return $this->value;
     }
+
+    public function toArray(): array
+    {
+        return [
+            'identifier' => $this->toString(),
+        ];
+    }
+
+    /**
+     * @return non-empty-string
+     */
+    public function jsonSerialize(): string
+    {
+        return $this->toString();
+    }
 }

src/Node/Identifier.php

@@ -40,4 +40,12 @@ public function getValue(): bool
     {
         return $this->value;
     }
+
+    public function toArray(): array
+    {
+        return [
+            ...parent::toArray(),
+            'kind' => LiteralKind::BOOL_KIND,
+        ];
+    }
 }

src/Node/Literal/BoolLiteralNode.php

@@ -40,4 +40,12 @@ public function getValue(): float
     {
         return $this->value;
     }
+
+    public function toArray(): array
+    {
+        return [
+            ...parent::toArray(),
+            'kind' => LiteralKind::FLOAT_KIND,
+        ];
+    }
 }