wip php 8.3

vojtech-dobes · vojtech-dobes · commit 707c2527b190 · 2025-06-03T16:02:28.000+02:00
diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
@@ -41,6 +41,7 @@ jobs:
           - ubuntu-latest
           - windows-latest
         php:
+          - '8.3'
           - '8.4'
 
       fail-fast: false
diff --git a/composer.json b/composer.json
@@ -29,7 +29,7 @@
 	],
 	"name": "vojtech-dobes/php-grammar-processing",
 	"require": {
-		"php": "~8.4",
+		"php": "~8.3",
 		"ext-pcre": "*"
 	},
 	"require-dev": {
diff --git a/composer.lock b/composer.lock
diff --git a/src/GrammarProcessing/AbstractSyntaxTree.php b/src/GrammarProcessing/AbstractSyntaxTree.php
@@ -19,6 +19,23 @@ public function __construct(
 
 
 
+	/**
+	 * @return TName
+	 */
+	public function getName(): string
+	{
+		return $this->name;
+	}
+
+
+
+	public function getValue(): mixed
+	{
+		return $this->value;
+	}
+
+
+
 	public function interpret(Interpretation $interpretation): mixed
 	{
 		$nodeInterpretations = $interpretation->nodeInterpretations;
@@ -33,23 +50,23 @@ public function interpret(Interpretation $interpretation): mixed
 				$subnode = $currentGenerator->current();
 
 				if ($subnode instanceof SelectedNode) {
-					$subnode = $subnode->value;
+					$subnode = $subnode->getValue();
 				}
 
 				if ($subnode === NULL) {
 					$currentGenerator->send(NULL);
 				} elseif ($subnode instanceof Token) {
 					$currentGenerator->send($subnode->value);
 				} elseif ($subnode instanceof TokenNode) {
-					if (isset($nodeInterpretations[$subnode->name])) {
+					if (isset($nodeInterpretations[$subnode->getName()])) {
 						$generatorStack[] = $currentGenerator;
-						$currentGenerator = $nodeInterpretations[$subnode->name]->interpret($subnode);
+						$currentGenerator = $nodeInterpretations[$subnode->getName()]->interpret($subnode);
 					} else {
 						$currentGenerator->send($subnode->value->value);
 					}
 				} else {
 					$generatorStack[] = $currentGenerator;
-					$currentGenerator = $nodeInterpretations[$subnode->name]->interpret($subnode->value);
+					$currentGenerator = $nodeInterpretations[$subnode->getName()]->interpret($subnode->getValue());
 				}
 			} else {
 				$currentNodeValue = $currentGenerator->getReturn();
diff --git a/src/GrammarProcessing/Ebnf/Nodes/Alternation.php b/src/GrammarProcessing/Ebnf/Nodes/Alternation.php
@@ -12,11 +12,11 @@ final class Alternation implements GrammarProcessing\NodeInterpretation
 	public function interpret(GrammarProcessing\Node $node): Generator
 	{
 		$result = [
-			yield $node->value[1],
+			yield $node->getValue()[1],
 		];
 
-		foreach ($node->value[3]->value as $item) {
-			$result[] = yield $item->value[2];
+		foreach ($node->getValue()[3]->getValue() as $item) {
+			$result[] = yield $item->getValue()[2];
 		}
 
 		if (count($result) === 1) {
diff --git a/src/GrammarProcessing/Ebnf/Nodes/Concatenation.php b/src/GrammarProcessing/Ebnf/Nodes/Concatenation.php
@@ -12,11 +12,11 @@ final class Concatenation implements GrammarProcessing\NodeInterpretation
 	public function interpret(GrammarProcessing\Node $node): Generator
 	{
 		$result = [
-			yield $node->value[1],
+			yield $node->getValue()[1],
 		];
 
-		foreach ($node->value[3]->value as $item) {
-			$result[] = yield $item->value[2];
+		foreach ($node->getValue()[3]->getValue() as $item) {
+			$result[] = yield $item->getValue()[2];
 		}
 
 		if (count($result) === 1) {
diff --git a/src/GrammarProcessing/Ebnf/Nodes/Factor.php b/src/GrammarProcessing/Ebnf/Nodes/Factor.php
@@ -16,25 +16,25 @@ public function interpret(GrammarProcessing\Node $node): Generator
 
 		return match ($node->index) {
 			0 => new GrammarProcessing\Vocabulary\Repeat(
-				yield $node->value[0],
+				yield $node->getValue()[0],
 				0,
 				1,
 			),
 			1 => new GrammarProcessing\Vocabulary\Repeat(
-				yield $node->value[0],
+				yield $node->getValue()[0],
 				0,
 				null,
 			),
 			2 => new GrammarProcessing\Vocabulary\Repeat(
-				yield $node->value[0],
+				yield $node->getValue()[0],
 				1,
 				null,
 			),
 			3 => new GrammarProcessing\Vocabulary\Subtract(
-				yield $node->value[0],
-				yield $node->value[4],
+				yield $node->getValue()[0],
+				yield $node->getValue()[4],
 			),
-			4 => yield $node->value[0],
+			4 => yield $node->getValue()[0],
 			default => throw new LogicException("This can't happen"),
 		};
 	}
diff --git a/src/GrammarProcessing/Ebnf/Nodes/Grammar.php b/src/GrammarProcessing/Ebnf/Nodes/Grammar.php
@@ -30,8 +30,8 @@ public function interpret(GrammarProcessing\Node $node): Generator
 	{
 		$result = [];
 
-		foreach ($node->value as $item) {
-			[$identifier, $production] = yield $item->value[1];
+		foreach ($node->getValue() as $item) {
+			[$identifier, $production] = yield $item->getValue()[1];
 
 			$result[$identifier->nonterminal] = $production;
 		}
diff --git a/src/GrammarProcessing/Ebnf/Nodes/Identifier.php b/src/GrammarProcessing/Ebnf/Nodes/Identifier.php
@@ -11,7 +11,7 @@ final class Identifier implements GrammarProcessing\NodeInterpretation
 
 	public function interpret(GrammarProcessing\Node $node): Generator
 	{
-		return new GrammarProcessing\Vocabulary\Nonterminal(yield $node->value);
+		return new GrammarProcessing\Vocabulary\Nonterminal(yield $node->getValue());
 	}
 
 }
diff --git a/src/GrammarProcessing/Ebnf/Nodes/Rule.php b/src/GrammarProcessing/Ebnf/Nodes/Rule.php
@@ -11,8 +11,8 @@ final class Rule implements GrammarProcessing\NodeInterpretation
 
 	public function interpret(GrammarProcessing\Node $node): Generator
 	{
-		$identifier = yield $node->value[0];
-		$production = yield $node->value[4];
+		$identifier = yield $node->getValue()[0];
+		$production = yield $node->getValue()[4];
 
 		return [$identifier, $production];
 	}
diff --git a/src/GrammarProcessing/Ebnf/Nodes/Term.php b/src/GrammarProcessing/Ebnf/Nodes/Term.php
@@ -15,19 +15,19 @@ public function interpret(GrammarProcessing\Node $node): Generator
 		/** @var GrammarProcessing\SelectedNode $node */
 
 		return match ($node->index) {
-			0 => yield $node->value[2],
+			0 => yield $node->getValue()[2],
 			1 => new GrammarProcessing\Vocabulary\Repeat(
-				yield $node->value[2],
+				yield $node->getValue()[2],
 				0,
 				1,
 			),
 			2 => new GrammarProcessing\Vocabulary\Repeat(
-				yield $node->value[2],
+				yield $node->getValue()[2],
 				0,
 				null,
 			),
-			3 => yield $node->value,
-			4 => yield $node->value,
+			3 => yield $node->getValue(),
+			4 => yield $node->getValue(),
 			default => throw new LogicException("This can't happen"),
 		};
 	}
diff --git a/src/GrammarProcessing/Ebnf/Nodes/Terminal.php b/src/GrammarProcessing/Ebnf/Nodes/Terminal.php
@@ -11,7 +11,7 @@ final class Terminal implements GrammarProcessing\NodeInterpretation
 
 	public function interpret(GrammarProcessing\Node $node): Generator
 	{
-		$value = yield $node->value;
+		$value = yield $node->getValue();
 
 		if (str_starts_with($value, '"')) {
 			$value = trim($value, '"');
diff --git a/src/GrammarProcessing/Ebnf/Parser.php b/src/GrammarProcessing/Ebnf/Parser.php
@@ -27,8 +27,8 @@ public function __construct(
 		array $ignoredTokenSymbols,
 	)
 	{
-		$this->ebnfGrammar = new GrammarFactory()->createGrammar();
-		$this->ebnfInterpretation = new InterpretationFactory()->createInterpretation(
+		$this->ebnfGrammar = (new GrammarFactory())->createGrammar();
+		$this->ebnfInterpretation = (new InterpretationFactory())->createInterpretation(
 			lexicalSymbols: $lexicalSymbols,
 			syntaxTokenSymbols: $syntaxTokenSymbols,
 			ignoredTokenSymbols: $ignoredTokenSymbols,
diff --git a/src/GrammarProcessing/EmptyNode.php b/src/GrammarProcessing/EmptyNode.php
@@ -6,18 +6,22 @@
 final class EmptyNode implements Node
 {
 
-	public null $value {
+	public function __construct(
+		public readonly string $name,
+	) {}
+
 
-		get {
-			return null;
-		}
 
+	public function getName(): string
+	{
+		return $this->name;
 	}
 
 
 
-	public function __construct(
-		public readonly string $name,
-	) {}
+	public function getValue(): null
+	{
+		return null;
+	}
 
 }
diff --git a/src/GrammarProcessing/LexicalGrammar.php b/src/GrammarProcessing/LexicalGrammar.php
@@ -129,7 +129,7 @@ private function createRegexPattern(): string
 		return '~' . implode('|', array_map(
 			fn ($lexicalSymbol) => sprintf(
 				'(%s)',
-				new Vocabulary\Nonterminal($lexicalSymbol)->getPattern($this->symbols),
+				(new Vocabulary\Nonterminal($lexicalSymbol))->getPattern($this->symbols),
 			),
 			[...$this->ignoredTokenSymbols, ...$this->syntaxTokenSymbols],
 		)) . '~u';
diff --git a/src/GrammarProcessing/ListNode.php b/src/GrammarProcessing/ListNode.php
@@ -8,23 +8,30 @@
 final class ListNode implements Node
 {
 
-	public string $name {
+	/**
+	 * @param list<Node> $value
+	 */
+	public function __construct(
+		public readonly array $value,
+	) {}
 
-		get {
-			throw new LogicException(
-				self::class . " must be parsed manually",
-			);
-		}
 
+
+	public function getName(): never
+	{
+		throw new LogicException(
+			self::class . " must be parsed manually",
+		);
 	}
 
 
 
 	/**
-	 * @param list<Node> $value
+	 * @return list<Node>
 	 */
-	public function __construct(
-		public readonly array $value,
-	) {}
+	public function getValue(): array
+	{
+		return $this->value;
+	}
 
 }
diff --git a/src/GrammarProcessing/Node.php b/src/GrammarProcessing/Node.php
@@ -6,7 +6,10 @@
 interface Node
 {
 
-	public string $name { get; }
-	public mixed $value { get; }
+	function getName(): string;
+
+
+
+	function getValue(): mixed;
 
 }
diff --git a/src/GrammarProcessing/NonterminalNode.php b/src/GrammarProcessing/NonterminalNode.php
@@ -11,4 +11,18 @@ public function __construct(
 		public readonly mixed $value,
 	) {}
 
+
+
+	public function getName(): string
+	{
+		return $this->name;
+	}
+
+
+
+	public function getValue(): mixed
+	{
+		return $this->value;
+	}
+
 }
diff --git a/src/GrammarProcessing/SelectedNode.php b/src/GrammarProcessing/SelectedNode.php
@@ -8,31 +8,27 @@
 final class SelectedNode implements Node
 {
 
-	public string $name {
-
-		get {
-			throw new LogicException(
-				self::class . " must be parsed manually",
-			);
-		}
-
-	}
+	public function __construct(
+		public readonly int $index,
+		public readonly Node $subnode,
+	) {}
 
-	public mixed $value {
 
-		get {
-			return $this->subnode instanceof ListNode
-				? $this->subnode->value
-				: $this->subnode;
-		}
 
+	public function getName(): never
+	{
+		throw new LogicException(
+			self::class . " must be parsed manually",
+		);
 	}
 
 
 
-	public function __construct(
-		public readonly int $index,
-		public readonly Node $subnode,
-	) {}
+	public function getValue(): mixed
+	{
+		return $this->subnode instanceof ListNode
+			? $this->subnode->value
+			: $this->subnode;
+	}
 
 }
diff --git a/src/GrammarProcessing/TokenNode.php b/src/GrammarProcessing/TokenNode.php

Original file line number	Diff line number	Diff line change
`@@ -12,11 +12,11 @@ final class Alternation implements GrammarProcessing\NodeInterpretation`
`12`	`12`	`public function interpret(GrammarProcessing\Node $node): Generator`
`13`	`13`	`{`
`14`	`14`	`$result = [`
`15`		`- yield $node->value[1],`
	`15`	`+ yield $node->getValue()[1],`
`16`	`16`	`];`
`17`	`17`
`18`		`- foreach ($node->value[3]->value as $item) {`
`19`		`- $result[] = yield $item->value[2];`
	`18`	`+ foreach ($node->getValue()[3]->getValue() as $item) {`
	`19`	`+ $result[] = yield $item->getValue()[2];`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`if (count($result) === 1) {`
Original file line number	Diff line number	Diff line change
`@@ -12,11 +12,11 @@ final class Concatenation implements GrammarProcessing\NodeInterpretation`
`12`	`12`	`public function interpret(GrammarProcessing\Node $node): Generator`
`13`	`13`	`{`
`14`	`14`	`$result = [`
`15`		`- yield $node->value[1],`
	`15`	`+ yield $node->getValue()[1],`
`16`	`16`	`];`
`17`	`17`
`18`		`- foreach ($node->value[3]->value as $item) {`
`19`		`- $result[] = yield $item->value[2];`
	`18`	`+ foreach ($node->getValue()[3]->getValue() as $item) {`
	`19`	`+ $result[] = yield $item->getValue()[2];`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`if (count($result) === 1) {`
Original file line number	Diff line number	Diff line change
`@@ -30,8 +30,8 @@ public function interpret(GrammarProcessing\Node $node): Generator`
`30`	`30`	`{`
`31`	`31`	`$result = [];`
`32`	`32`
`33`		`- foreach ($node->value as $item) {`
`34`		`- [$identifier, $production] = yield $item->value[1];`
	`33`	`+ foreach ($node->getValue() as $item) {`
	`34`	`+ [$identifier, $production] = yield $item->getValue()[1];`
`35`	`35`
`36`	`36`	`$result[$identifier->nonterminal] = $production;`
`37`	`37`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ final class Identifier implements GrammarProcessing\NodeInterpretation`
`11`	`11`
`12`	`12`	`public function interpret(GrammarProcessing\Node $node): Generator`
`13`	`13`	`{`
`14`		`- return new GrammarProcessing\Vocabulary\Nonterminal(yield $node->value);`
	`14`	`+ return new GrammarProcessing\Vocabulary\Nonterminal(yield $node->getValue());`
`15`	`15`	`}`
`16`	`16`
`17`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,8 +11,8 @@ final class Rule implements GrammarProcessing\NodeInterpretation`
`11`	`11`
`12`	`12`	`public function interpret(GrammarProcessing\Node $node): Generator`
`13`	`13`	`{`
`14`		`- $identifier = yield $node->value[0];`
`15`		`- $production = yield $node->value[4];`
	`14`	`+ $identifier = yield $node->getValue()[0];`
	`15`	`+ $production = yield $node->getValue()[4];`
`16`	`16`
`17`	`17`	`return [$identifier, $production];`
`18`	`18`	`}`