Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/Definition/Precedence.php
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ public static function forTokenType(TokenType $tokenType): self
TokenType::BRACKET_ROUND_CLOSE,
TokenType::BRACKET_SQUARE_OPEN,
TokenType::BRACKET_SQUARE_CLOSE,
TokenType::OPTCHAIN,
TokenType::PERIOD => self::ACCESS,

TokenType::OPERATOR_BOOLEAN_NOT => self::UNARY,
Expand Down
1 change: 1 addition & 0 deletions src/Parser/Ast/ExpressionNode.php
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,7 @@ public static function fromTokens(\Iterator $tokens, Precedence $precedence = Pr
$root = BinaryOperationNode::fromTokens(new self(root: $root), $tokens);
break;
case TokenType::PERIOD:
case TokenType::OPTCHAIN:
$root = AccessNode::fromTokens(new self(root: $root), $tokens);
break;
case TokenType::QUESTIONMARK:
Expand Down
1 change: 1 addition & 0 deletions src/Parser/Tokenizer/Tokenizer.php
Original file line number Diff line number Diff line change
Expand Up @@ -292,6 +292,7 @@ public static function symbol(\Iterator $fragments, ?Buffer $buffer = null): \It
'!==' => $buffer->flush(TokenType::COMPARATOR_NOT_EQUAL),
'->' => $buffer->flush(TokenType::ARROW_SINGLE),
':' => $buffer->flush(TokenType::COLON),
'?.' => $buffer->flush(TokenType::OPTCHAIN),
'.' => $buffer->flush(TokenType::PERIOD),
',' => $buffer->flush(TokenType::COMMA),
'=' => $buffer->flush(TokenType::EQUALS),
Expand Down
3 changes: 3 additions & 0 deletions src/Target/Php/Transpiler/Access/AccessTranspiler.php
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@

namespace PackageFactory\ComponentEngine\Target\Php\Transpiler\Access;

use PackageFactory\ComponentEngine\Definition\AccessType;
use PackageFactory\ComponentEngine\Parser\Ast\AccessNode;
use PackageFactory\ComponentEngine\Target\Php\Transpiler\Expression\ExpressionTranspiler;
use PackageFactory\ComponentEngine\TypeSystem\Resolver\Expression\ExpressionTypeResolver;
Expand Down Expand Up @@ -49,6 +50,8 @@ public function transpile(AccessNode $accessNode): string
foreach ($accessNode->chain->items as $accessChainNode) {
if ($typeOfRoot instanceof EnumStaticType && $isFirstElement) {
$result .= '::';
} elseif ($accessChainNode->accessType === AccessType::OPTIONAL) {
$result .= '?->';
} else {
$result .= '->';
}
Expand Down
12 changes: 12 additions & 0 deletions test/Unit/Target/Php/Transpiler/Access/AccessTranspilerTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,9 @@ public function accessExamples(): array
'a.b' => ['a.b', '$this->a->b'],
'a.b.c' => ['a.b.c', '$this->a->b->c'],
'SomeEnum.A' => ['SomeEnum.A', 'SomeEnum::A'],
'someStruct.foo' => ['someStruct.foo', '$this->someStruct->foo'],
'someStruct?.foo' => ['someStruct?.foo', '$this->someStruct?->foo'],
'someStruct.deep?.foo' => ['someStruct.deep?.foo', '$this->someStruct->deep?->foo']
];
}

Expand All @@ -66,6 +69,15 @@ public function transpilesAccessNodes(string $accessAsString, string $expectedTr
EnumDeclarationNode::fromString(
'enum SomeEnum { A B C }'
)
),
'someStruct' => StructType::fromStructDeclarationNode(
StructDeclarationNode::fromString(<<<'AFX'
struct SomeStruct {
foo: string
deep: ?SomeStruct
}
AFX
)
)
])
);
Expand Down