Remove cached parsers (slower than the runtime)

Author: Kirill Nesmeyanov

bin/build

@@ -34,13 +34,13 @@ if (!class_exists(Compiler::class)) {
 $grammar = (new Compiler())
     ->load(new SplFileInfo(__DIR__ . '/../resources/grammar.pp2'))
     ->build()
-        ->withClassUsage('TypeLang\\Parser\\Node')
-        ->withClassUsage('TypeLang\\Parser\\Exception')
-        ->withClassUsage('TypeLang\\Parser\\Exception\\SemanticException')
-        ->withClassUsage('TypeLang\\Parser\\Exception\\FeatureNotAllowedException')
-;
+        ->withClassReference('TypeLang\\Parser\\Node')
+        ->withClassReference('TypeLang\\Parser\\Exception')
+        ->withClassReference('TypeLang\\Parser\\Exception\\SemanticException')
+        ->withClassReference('TypeLang\\Parser\\Exception\\FeatureNotAllowedException')
+    ->generate();
 
-file_put_contents(__DIR__ . '/../resources/grammar.php', $grammar->generate());
+file_put_contents(__DIR__ . '/../resources/grammar.php', $grammar);
 
 //
 // Postprocess and optimize output grammar

composer.json

@@ -10,9 +10,6 @@
     },
     "require": {
         "php": "^8.1",
-        "psr/cache": "^1.0|^2.0|^3.0",
-        "psr/simple-cache": "^1.0|^2.0|^3.0",
-        "psr/log": "^1.0|^2.0|^3.0",
         "phplrt/lexer": "^3.6",
         "phplrt/parser": "^3.6",
         "phplrt/source": "^3.6"

src/CachedParser.php

@@ -0,0 +1,37 @@
+<?php
+
+declare(strict_types=1);
+
+namespace TypeLang\Parser;
+
+use JetBrains\PhpStorm\Language;
+use Phplrt\Contracts\Source\SourceExceptionInterface;
+use Phplrt\Contracts\Source\SourceFactoryInterface;
+use Phplrt\Source\SourceFactory;
+use TypeLang\Parser\Exception\ParserExceptionInterface;
+use TypeLang\Parser\Node\Stmt\TypeStatement;
+
+final class InMemoryCachedParser implements ParserInterface
+{
+    /**
+     * @var array<non-empty-string, TypeStatement|null>
+     */
+    private array $types = [];
+
+    public function __construct(
+        private readonly ParserInterface $parser = new Parser(),
+        private readonly SourceFactoryInterface $sources = new SourceFactory(),
+    ) {}
+
+    /**
+     * @throws ParserExceptionInterface
+     * @throws SourceExceptionInterface
+     * @throws \Throwable
+     */
+    public function parse(#[Language('PHP')] mixed $source): ?TypeStatement
+    {
+        $instance = $this->sources->create($source);
+
+        return $this->types[$instance->getHash()] ??= $this->parser->parse($source);
+    }
+}

src/InMemoryCachedParser.php

@@ -67,14 +67,13 @@ final class Parser implements ParserInterface
      */
     public int $lastProcessedTokenOffset = 0;
 
-    private readonly SourceFactoryInterface $sources;
-
     public function __construct(
         public readonly bool $tolerant = false,
         public readonly bool $conditional = true,
         public readonly bool $shapes = true,
         public readonly bool $callables = true,
         public readonly bool $literals = true,
+        private readonly SourceFactoryInterface $sources = new SourceFactory(),
     ) {
         /** @psalm-var GrammarConfigArray $grammar */
         $grammar = require __DIR__ . '/../resources/grammar.php';
@@ -85,7 +84,6 @@ public function __construct(
         /** @var \WeakMap<TokenInterface, IntLiteralNode> */
         $this->integerPool = new \WeakMap();
 
-        $this->sources = new SourceFactory();
         $this->builder = new Builder($grammar['reducers']);
         $this->lexer = $this->createLexer($grammar);
         $this->parser = $this->createParser($this->lexer, $grammar);