Skip to content

Commit 744c21f

Browse files
committed
TASK: Remove NodeAttributes class
Every node has a property `rangeInSource` instead.
1 parent bbc5da7 commit 744c21f

File tree

63 files changed

+1302
-2109
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+1302
-2109
lines changed

src/Language/AST/ASTException.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,14 @@
2222

2323
namespace PackageFactory\ComponentEngine\Language\AST;
2424

25-
use PackageFactory\ComponentEngine\Language\AST\NodeAttributes\NodeAttributes;
25+
use PackageFactory\ComponentEngine\Parser\Source\Range;
2626

2727
abstract class ASTException extends \Exception
2828
{
2929
protected function __construct(
3030
int $code,
3131
string $message,
32-
public readonly ?NodeAttributes $attributesOfAffectedNode = null
32+
public readonly ?Range $affectedRangeInSource = null
3333
) {
3434
parent::__construct($message, $code);
3535
}

src/Language/AST/Node/AccessChain/AccessChainNode.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@
2424

2525
use PackageFactory\ComponentEngine\Language\AST\Node\Expression\ExpressionNode;
2626
use PackageFactory\ComponentEngine\Language\AST\Node\Node;
27-
use PackageFactory\ComponentEngine\Language\AST\NodeAttributes\NodeAttributes;
27+
use PackageFactory\ComponentEngine\Parser\Source\Range;
2828

2929
final class AccessChainNode extends Node
3030
{
3131
public function __construct(
32-
public readonly NodeAttributes $attributes,
32+
public readonly Range $rangeInSource,
3333
public readonly ExpressionNode $root,
3434
public readonly AccessChainSegmentNodes $chain
3535
) {

src/Language/AST/Node/AccessChain/AccessChainSegmentKeyNode.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@
2424

2525
use PackageFactory\ComponentEngine\Domain\PropertyName\PropertyName;
2626
use PackageFactory\ComponentEngine\Language\AST\Node\Node;
27-
use PackageFactory\ComponentEngine\Language\AST\NodeAttributes\NodeAttributes;
27+
use PackageFactory\ComponentEngine\Parser\Source\Range;
2828

2929
final class AccessChainSegmentKeyNode extends Node
3030
{
3131
public function __construct(
32-
public readonly NodeAttributes $attributes,
32+
public readonly Range $rangeInSource,
3333
public readonly PropertyName $value
3434
) {
3535
}

src/Language/AST/Node/AccessChain/AccessChainSegmentNode.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@
2323
namespace PackageFactory\ComponentEngine\Language\AST\Node\AccessChain;
2424

2525
use PackageFactory\ComponentEngine\Language\AST\Node\Node;
26-
use PackageFactory\ComponentEngine\Language\AST\NodeAttributes\NodeAttributes;
26+
use PackageFactory\ComponentEngine\Parser\Source\Range;
2727

2828
final class AccessChainSegmentNode extends Node
2929
{
3030
public function __construct(
31-
public readonly NodeAttributes $attributes,
31+
public readonly Range $rangeInSource,
3232
public readonly AccessType $accessType,
3333
public readonly AccessChainSegmentKeyNode $key
3434
) {

src/Language/AST/Node/BinaryOperation/BinaryOperationNode.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@
2424

2525
use PackageFactory\ComponentEngine\Language\AST\Node\Expression\ExpressionNode;
2626
use PackageFactory\ComponentEngine\Language\AST\Node\Node;
27-
use PackageFactory\ComponentEngine\Language\AST\NodeAttributes\NodeAttributes;
27+
use PackageFactory\ComponentEngine\Parser\Source\Range;
2828

2929
final class BinaryOperationNode extends Node
3030
{
3131
public function __construct(
32-
public readonly NodeAttributes $attributes,
32+
public readonly Range $rangeInSource,
3333
public readonly ExpressionNode $leftOperand,
3434
public readonly BinaryOperator $operator,
3535
public readonly ExpressionNode $rightOperand

src/Language/AST/Node/BooleanLiteral/BooleanLiteralNode.php

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,13 @@
2323
namespace PackageFactory\ComponentEngine\Language\AST\Node\BooleanLiteral;
2424

2525
use PackageFactory\ComponentEngine\Language\AST\Node\Node;
26-
use PackageFactory\ComponentEngine\Language\AST\NodeAttributes\NodeAttributes;
26+
use PackageFactory\ComponentEngine\Parser\Source\Range;
2727

2828
final class BooleanLiteralNode extends Node
2929
{
3030
public function __construct(
31-
public readonly NodeAttributes $attributes,
31+
public readonly Range $rangeInSource,
3232
public readonly bool $value
3333
) {
34-
// parent::__construct($attributes);
3534
}
3635
}

src/Language/AST/Node/EnumDeclaration/EnumDeclarationNode.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@
2323
namespace PackageFactory\ComponentEngine\Language\AST\Node\EnumDeclaration;
2424

2525
use PackageFactory\ComponentEngine\Language\AST\Node\Node;
26-
use PackageFactory\ComponentEngine\Language\AST\NodeAttributes\NodeAttributes;
26+
use PackageFactory\ComponentEngine\Parser\Source\Range;
2727

2828
final class EnumDeclarationNode extends Node
2929
{
3030
public function __construct(
31-
public readonly NodeAttributes $attributes,
31+
public readonly Range $rangeInSource,
3232
public readonly EnumNameNode $name,
3333
public readonly EnumMemberDeclarationNodes $members
3434
) {

src/Language/AST/Node/EnumDeclaration/EnumMemberDeclarationNode.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@
2323
namespace PackageFactory\ComponentEngine\Language\AST\Node\EnumDeclaration;
2424

2525
use PackageFactory\ComponentEngine\Language\AST\Node\Node;
26-
use PackageFactory\ComponentEngine\Language\AST\NodeAttributes\NodeAttributes;
26+
use PackageFactory\ComponentEngine\Parser\Source\Range;
2727

2828
final class EnumMemberDeclarationNode extends Node
2929
{
3030
public function __construct(
31-
public readonly NodeAttributes $attributes,
31+
public readonly Range $rangeInSource,
3232
public readonly EnumMemberNameNode $name,
3333
public readonly ?EnumMemberValueNode $value
3434
) {

src/Language/AST/Node/EnumDeclaration/EnumMemberDeclarationNodes.php

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,8 @@ final class EnumMemberDeclarationNodes
2929
*/
3030
public readonly array $items;
3131

32-
public function __construct(
33-
EnumMemberDeclarationNode ...$items
34-
) {
32+
public function __construct(EnumMemberDeclarationNode ...$items)
33+
{
3534
$itemsAsHashMap = [];
3635
foreach ($items as $item) {
3736
$itemsAsHashMap[$item->name->value->value] = $item;

src/Language/AST/Node/EnumDeclaration/EnumMemberNameNode.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@
2424

2525
use PackageFactory\ComponentEngine\Domain\EnumMemberName\EnumMemberName;
2626
use PackageFactory\ComponentEngine\Language\AST\Node\Node;
27-
use PackageFactory\ComponentEngine\Language\AST\NodeAttributes\NodeAttributes;
27+
use PackageFactory\ComponentEngine\Parser\Source\Range;
2828

2929
final class EnumMemberNameNode extends Node
3030
{
3131
public function __construct(
32-
public readonly NodeAttributes $attributes,
32+
public readonly Range $rangeInSource,
3333
public readonly EnumMemberName $value
3434
) {
3535
}

0 commit comments

Comments
 (0)