WIP: Feature: Try out parsica

composer.json

@@ -7,7 +7,8 @@
       "test": "./scripts/test"
     },
     "require": {
-        "php": ">=8.1"
+        "php": ">=8.1",
+        "parsica-php/parsica": "^0.8.1"
     },
     "autoload": {
         "psr-4": {

src/Definition/Precedence.php

@@ -24,8 +24,6 @@
 
 use PackageFactory\ComponentEngine\Parser\Tokenizer\TokenType;
 
-
-
 enum Precedence: int
 {
     //
@@ -81,8 +79,13 @@ public static function forTokenType(TokenType $tokenType): self
         };
     }
 
-    public function mustStopAt(TokenType $tokenType): bool
+    public function mustStopAt(self $precedence): bool
+    {
+        return $precedence->value <= $this->value;
+    }
+
+    public function mustStopAtTokenType(TokenType $tokenType): bool
     {
-        return self::forTokenType($tokenType)->value <= $this->value;
+        return $this->mustStopAt(self::forTokenType($tokenType));
     }
 }

src/Definition/UnaryOperator.php

@@ -35,4 +35,11 @@ public static function fromTokenType(TokenType $tokenType): self
             default => throw new \Exception('@TODO: Unknown Unary Operator')
         };
     }
+
+    public function toPrecedence(): Precedence
+    {
+        return match ($this) {
+            self::NOT => Precedence::UNARY
+        };
+    }
 }

src/Module/Loader/ModuleFile/ModuleFileLoader.php

@@ -40,7 +40,7 @@ final class ModuleFileLoader implements LoaderInterface
 {
     public function resolveTypeOfImport(ImportNode $importNode): TypeInterface
     {
-        $pathToImportFrom = $importNode->source->path->resolveRelationTo(
+        $pathToImportFrom = $importNode->sourcePath->resolveRelationTo(
             Path::fromString($importNode->path)
         );
         $source = Source::fromFile($pathToImportFrom->value);

src/Parser/Ast/AccessChainSegmentNode.php

@@ -29,7 +29,7 @@
 
 final class AccessChainSegmentNode implements \JsonSerializable
 {
-    private function __construct(
+    public function __construct(
         public readonly AccessType $accessType,
         public readonly IdentifierNode $accessor
     ) {

src/Parser/Ast/AccessChainSegmentNodes.php

@@ -33,7 +33,7 @@ final class AccessChainSegmentNodes implements \JsonSerializable
      */
     public readonly array $items;
 
-    private function __construct(
+    public function __construct(
         AccessChainSegmentNode ...$items
     ) {
         $this->items = $items;

src/Parser/Ast/AccessNode.php

@@ -26,7 +26,7 @@
 
 final class AccessNode implements \JsonSerializable
 {
-    private function __construct(
+    public function __construct(
         public readonly ExpressionNode $root,
         public readonly AccessChainSegmentNodes $chain
     ) {

src/Parser/Ast/AttributeNode.php

@@ -30,7 +30,7 @@
 
 final class AttributeNode implements \JsonSerializable
 {
-    private function __construct(
+    public function __construct(
         public readonly string $name,
         public readonly ExpressionNode | StringLiteralNode $value
     ) {

src/Parser/Ast/AttributeNodes.php

@@ -33,7 +33,7 @@ final class AttributeNodes implements \JsonSerializable
      */
     public readonly array $items;
 
-    private function __construct(
+    public function __construct(
         AttributeNode ...$items
     ) {
         $itemsAsHashMap = [];

src/Parser/Ast/BinaryOperationNode.php

@@ -28,7 +28,7 @@
 
 final class BinaryOperationNode implements \JsonSerializable
 {
-    private function __construct(
+    public function __construct(
         public readonly ExpressionNode $left,
         public readonly BinaryOperator $operator,
         public readonly ExpressionNode $right

src/Parser/Ast/BooleanLiteralNode.php

@@ -28,7 +28,7 @@
 
 final class BooleanLiteralNode implements \JsonSerializable
 {
-    private function __construct(
+    public function __construct(
         public readonly bool $value
     ) {
     }

src/Parser/Ast/ComponentDeclarationNode.php

@@ -22,15 +22,14 @@
 
 namespace PackageFactory\ComponentEngine\Parser\Ast;
 
-use PackageFactory\ComponentEngine\Parser\Source\Source;
+use PackageFactory\ComponentEngine\Parser\Parser\ComponentDeclaration\ComponentDeclarationParser;
 use PackageFactory\ComponentEngine\Parser\Tokenizer\Scanner;
 use PackageFactory\ComponentEngine\Parser\Tokenizer\Token;
-use PackageFactory\ComponentEngine\Parser\Tokenizer\Tokenizer;
 use PackageFactory\ComponentEngine\Parser\Tokenizer\TokenType;
 
 final class ComponentDeclarationNode implements \JsonSerializable
 {
-    private function __construct(
+    public function __construct(
         public readonly string $componentName,
         public readonly PropertyDeclarationNodes $propertyDeclarations,
         public readonly ExpressionNode $returnExpression
@@ -39,11 +38,7 @@ private function __construct(
 
     public static function fromString(string $componentDeclarationAsString): self
     {
-        return self::fromTokens(
-            Tokenizer::fromSource(
-                Source::fromString($componentDeclarationAsString)
-            )->getIterator()
-        );
+        return ComponentDeclarationParser::parseFromString($componentDeclarationAsString);
     }
 
     /**

src/Parser/Ast/EnumDeclarationNode.php

@@ -22,6 +22,7 @@
 
 namespace PackageFactory\ComponentEngine\Parser\Ast;
 
+use PackageFactory\ComponentEngine\Parser\Parser\EnumDeclaration\EnumDeclarationParser;
 use PackageFactory\ComponentEngine\Parser\Source\Source;
 use PackageFactory\ComponentEngine\Parser\Tokenizer\Scanner;
 use PackageFactory\ComponentEngine\Parser\Tokenizer\Token;
@@ -30,19 +31,15 @@
 
 final class EnumDeclarationNode implements \JsonSerializable
 {
-    private function __construct(
+    public function __construct(
         public readonly string $enumName,
         public readonly EnumMemberDeclarationNodes $memberDeclarations
     ) {
     }
 
     public static function fromString(string $enumDeclarationAsString): self
     {
-        return self::fromTokens(
-            Tokenizer::fromSource(
-                Source::fromString($enumDeclarationAsString)
-            )->getIterator()
-        );
+        return EnumDeclarationParser::parseFromString($enumDeclarationAsString);
     }
 
     /**

src/Parser/Ast/EnumMemberDeclarationNode.php

@@ -28,7 +28,7 @@
 
 final class EnumMemberDeclarationNode implements \JsonSerializable
 {
-    private function __construct(
+    public function __construct(
         public readonly string $name,
         public readonly null|StringLiteralNode|NumberLiteralNode $value
     ) {

src/Parser/Ast/EnumMemberDeclarationNodes.php

@@ -33,7 +33,7 @@ final class EnumMemberDeclarationNodes implements \JsonSerializable
      */
     public readonly array $items;
 
-    private function __construct(
+    public function __construct(
         EnumMemberDeclarationNode ...$items
     ) {
         $itemsAsHashMap = [];

src/Parser/Ast/ExportNode.php

@@ -28,7 +28,7 @@
 
 final class ExportNode implements \JsonSerializable
 {
-    private function __construct(
+    public function __construct(
         public readonly ComponentDeclarationNode | EnumDeclarationNode | StructDeclarationNode $declaration,
     ) {
     }

src/Parser/Ast/ExportNodes.php

@@ -22,29 +22,35 @@
 
 namespace PackageFactory\ComponentEngine\Parser\Ast;
 
-use PackageFactory\ComponentEngine\Parser\Ast\ComponentDeclarationNode;
-use PackageFactory\ComponentEngine\Parser\Ast\EnumDeclarationNode;
-use PackageFactory\ComponentEngine\Parser\Ast\InterfaceDeclarationNode;
-
 final class ExportNodes implements \JsonSerializable
 {
     /**
      * @var array<string,ExportNode>
      */
     public readonly array $items;
 
-    /**
-     * @param array<string,ExportNode> $items
-     */
-    private function __construct(
-        array $items
+    public function __construct(
+        ExportNode ...$items
     ) {
-        $this->items = $items;
+        $itemsAsHashMap = [];
+        foreach ($items as $item) {
+            $name = match ($item->declaration::class) {
+                ComponentDeclarationNode::class => $item->declaration->componentName,
+                StructDeclarationNode::class => $item->declaration->structName,
+                EnumDeclarationNode::class => $item->declaration->enumName
+            };
+            if (array_key_exists($name, $itemsAsHashMap)) {
+                throw new \Exception('@TODO: Duplicate Export ' . $name);
+            }
+            $itemsAsHashMap[$name] = $item;
+        }
+
+        $this->items = $itemsAsHashMap;
     }
 
     public static function empty(): self
     {
-        return new self([]);
+        return new self();
     }
 
     public function withAddedExport(ExportNode $export): self
@@ -59,7 +65,7 @@ public function withAddedExport(ExportNode $export): self
             throw new \Exception('@TODO: Duplicate Export ' . $name);
         }
 
-        return new self([...$this->items, ...[$name => $export]]);
+        return new self(...[...$this->items, ...[$name => $export]]);
     }
 
     public function get(string $name): ?ExportNode

src/Parser/Ast/ExpressionNode.php

@@ -23,27 +23,23 @@
 namespace PackageFactory\ComponentEngine\Parser\Ast;
 
 use PackageFactory\ComponentEngine\Definition\Precedence;
-use PackageFactory\ComponentEngine\Parser\Source\Source;
+use PackageFactory\ComponentEngine\Parser\Parser\Expression\ExpressionParser;
 use PackageFactory\ComponentEngine\Parser\Tokenizer\LookAhead;
 use PackageFactory\ComponentEngine\Parser\Tokenizer\Scanner;
 use PackageFactory\ComponentEngine\Parser\Tokenizer\Token;
-use PackageFactory\ComponentEngine\Parser\Tokenizer\Tokenizer;
 use PackageFactory\ComponentEngine\Parser\Tokenizer\TokenType;
 
 final class ExpressionNode implements \JsonSerializable
 {
-    private function __construct(
+    public function __construct(
         public readonly IdentifierNode | NumberLiteralNode | BinaryOperationNode | UnaryOperationNode | AccessNode | TernaryOperationNode | TagNode | StringLiteralNode | MatchNode | TemplateLiteralNode | BooleanLiteralNode | NullLiteralNode $root
     ) {
     }
 
+    /** @deprecated */
     public static function fromString(string $expressionAsString): self
     {
-        return self::fromTokens(
-            Tokenizer::fromSource(
-                Source::fromString($expressionAsString)
-            )->getIterator()
-        );
+        return ExpressionParser::parseFromString($expressionAsString);
     }
 
     /**
@@ -123,7 +119,7 @@ public static function fromTokens(\Iterator $tokens, Precedence $precedence = Pr
 
         Scanner::skipSpaceAndComments($tokens);
 
-        while (!Scanner::isEnd($tokens) && !$precedence->mustStopAt(Scanner::type($tokens))) {
+        while (!Scanner::isEnd($tokens) && !$precedence->mustStopAtTokenType(Scanner::type($tokens))) {
             switch (Scanner::type($tokens)) {
                 case TokenType::OPERATOR_BOOLEAN_AND:
                 case TokenType::OPERATOR_BOOLEAN_OR:

src/Parser/Ast/ExpressionNodes.php

@@ -33,7 +33,7 @@ final class ExpressionNodes implements \JsonSerializable
      */
     public readonly array $items;
 
-    private function __construct(
+    public function __construct(
         ExpressionNode ...$items
     ) {
         $this->items = $items;

src/Parser/Ast/IdentifierNode.php

@@ -22,6 +22,7 @@
 
 namespace PackageFactory\ComponentEngine\Parser\Ast;
 
+use PackageFactory\ComponentEngine\Parser\Parser\Identifier\IdentifierParser;
 use PackageFactory\ComponentEngine\Parser\Source\Source;
 use PackageFactory\ComponentEngine\Parser\Tokenizer\Scanner;
 use PackageFactory\ComponentEngine\Parser\Tokenizer\Token;
@@ -30,18 +31,14 @@
 
 final class IdentifierNode implements \JsonSerializable
 {
-    private function __construct(
+    public function __construct(
         public readonly string $value
     ) {
     }
 
     public static function fromString(string $identifierAsString): self
     {
-        return self::fromTokens(
-            Tokenizer::fromSource(
-                Source::fromString($identifierAsString)
-            )->getIterator()
-        );
+        return IdentifierParser::get()->tryString($identifierAsString)->output();
     }
 
     /**

src/Parser/Ast/ImportNode.php

@@ -23,15 +23,16 @@
 namespace PackageFactory\ComponentEngine\Parser\Ast;
 
 use PackageFactory\ComponentEngine\Parser\Ast\IdentifierNode;
+use PackageFactory\ComponentEngine\Parser\Source\Path;
 use PackageFactory\ComponentEngine\Parser\Source\Source;
 use PackageFactory\ComponentEngine\Parser\Tokenizer\Scanner;
 use PackageFactory\ComponentEngine\Parser\Tokenizer\Token;
 use PackageFactory\ComponentEngine\Parser\Tokenizer\TokenType;
 
 final class ImportNode implements \JsonSerializable
 {
-    private function __construct(
-        public readonly Source $source,
+    public function __construct(
+        public readonly Path $sourcePath,
         public readonly string $path,
         public readonly IdentifierNode $name
     ) {
@@ -64,7 +65,7 @@ public static function fromTokens(\Iterator $tokens): \Iterator
 
         while (true) {
             $identifier = IdentifierNode::fromTokens($tokens);
-            yield new self($source, $path, $identifier);
+            yield new self($source->path, $path, $identifier);
 
             Scanner::skipSpaceAndComments($tokens);
             if (Scanner::type($tokens) === TokenType::COMMA) {