Skip to content

Commit bf35434

Browse files
author
Kirill Nesmeyanov
committed
Add offset access feature
1 parent fb0e8b9 commit bf35434

File tree

4 files changed

+83
-21
lines changed

4 files changed

+83
-21
lines changed

‎resources/grammar.php‎

Lines changed: 29 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -243,17 +243,18 @@
243243
new \Phplrt\Parser\Grammar\Concatenation([163, 158]),
244244
new \Phplrt\Parser\Grammar\Optional(164),
245245
new \Phplrt\Parser\Grammar\Alternation([169, 167]),
246-
new \Phplrt\Parser\Grammar\Concatenation([170, 174]),
246+
new \Phplrt\Parser\Grammar\Concatenation([170, 172]),
247247
new \Phplrt\Parser\Grammar\Lexeme('T_QMARK', true),
248248
new \Phplrt\Parser\Grammar\Concatenation([168, 167]),
249-
new \Phplrt\Parser\Grammar\Alternation([177, 29, 20, 66, 119]),
249+
new \Phplrt\Parser\Grammar\Alternation([178, 29, 20, 66, 119]),
250+
new \Phplrt\Parser\Grammar\Concatenation([173, 174, 175]),
251+
new \Phplrt\Parser\Grammar\Repetition(171, 0, INF),
250252
new \Phplrt\Parser\Grammar\Lexeme('T_SQUARE_BRACKET_OPEN', true),
253+
new \Phplrt\Parser\Grammar\Optional(59),
251254
new \Phplrt\Parser\Grammar\Lexeme('T_SQUARE_BRACKET_CLOSE', false),
252-
new \Phplrt\Parser\Grammar\Concatenation([171, 172]),
253-
new \Phplrt\Parser\Grammar\Repetition(173, 0, INF),
254255
new \Phplrt\Parser\Grammar\Lexeme('T_PARENTHESIS_OPEN', false),
255256
new \Phplrt\Parser\Grammar\Lexeme('T_PARENTHESIS_CLOSE', false),
256-
new \Phplrt\Parser\Grammar\Concatenation([175, 59, 176]),
257+
new \Phplrt\Parser\Grammar\Concatenation([176, 59, 177]),
257258
],
258259
'reducers' => [
259260
0 => static function (\Phplrt\Parser\Context $ctx, $children) {
@@ -693,16 +694,33 @@
693694

694695
$statement = \array_shift($children);
695696

696-
for ($i = 0, $length = \count($children); $i < $length; ++$i) {
697-
if ($this->list === false) {
698-
throw FeatureNotAllowedException::fromFeature('square bracket list types', $offset);
697+
foreach ($children as $child) {
698+
switch (true) {
699+
// In case of list type
700+
case $child === true:
701+
if ($this->list === false) {
702+
throw FeatureNotAllowedException::fromFeature('square bracket list types', $offset);
703+
}
704+
705+
$statement = new Node\Stmt\TypesListNode($statement);
706+
break;
707+
// In case of offset access type
708+
case $child instanceof Node\Stmt\NamedTypeNode:
709+
if ($this->offsets === false) {
710+
throw FeatureNotAllowedException::fromFeature('square bracket type offsets', $offset);
711+
}
712+
713+
$statement = new Node\Stmt\TypeOffsetAccessNode($statement, $child);
714+
break;
715+
default:
716+
throw new SemanticException($offset, 'Unexpected square bracket node type');
699717
}
700-
701-
$statement = new Node\Stmt\TypesListNode($statement);
702-
$statement->offset = $children[$i]->getOffset();
703718
}
704719

705720
return $statement;
706721
},
722+
171 => static function (\Phplrt\Parser\Context $ctx, $children) {
723+
return $children[1] ?? true;
724+
},
707725
],
708726
];

‎resources/grammar.pp2‎

Lines changed: 32 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -122,21 +122,43 @@ PrefixedNullableType -> {
122122
TypesList -> {
123123
$statement = \array_shift($children);
124124

125-
for ($i = 0, $length = \count($children); $i < $length; ++$i) {
126-
if ($this->list === false) {
127-
throw FeatureNotAllowedException::fromFeature('square bracket list types', $offset);
125+
foreach ($children as $child) {
126+
switch (true) {
127+
// In case of list type
128+
case $child === true:
129+
if ($this->list === false) {
130+
throw FeatureNotAllowedException::fromFeature('square bracket list types', $offset);
131+
}
132+
133+
$statement = new Node\Stmt\TypesListNode($statement);
134+
break;
135+
// In case of offset access type
136+
case $child instanceof Node\Stmt\NamedTypeNode:
137+
if ($this->offsets === false) {
138+
throw FeatureNotAllowedException::fromFeature('square bracket type offsets', $offset);
139+
}
140+
141+
$statement = new Node\Stmt\TypeOffsetAccessNode($statement, $child);
142+
break;
143+
default:
144+
throw new SemanticException($offset, 'Unexpected square bracket node type');
128145
}
129-
130-
$statement = new Node\Stmt\TypesListNode($statement);
131-
$statement->offset = $children[$i]->getOffset();
132146
}
133147

134148
return $statement;
135149
}
136-
: PrimaryType() (
137-
<T_SQUARE_BRACKET_OPEN>
138-
::T_SQUARE_BRACKET_CLOSE::
139-
)*
150+
: PrimaryType()
151+
TypeListOrOffsetSuffix()*
152+
;
153+
154+
// - Returns `true` in case of a list type (`T[]`).
155+
// - Returns `NamedTypeNode` in case of an offset access type (`T[Y]`).
156+
TypeListOrOffsetSuffix -> {
157+
return $children[1] ?? true;
158+
}
159+
: <T_SQUARE_BRACKET_OPEN>
160+
Type()?
161+
::T_SQUARE_BRACKET_CLOSE::
140162
;
141163

142164
PrimaryType

‎src/Node/Stmt/TypeOffsetAccessNode.php‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<?php
2+
3+
declare(strict_types=1);
4+
5+
namespace TypeLang\Parser\Node\Stmt;
6+
7+
/**
8+
* @template T of TypeStatement
9+
* @template-extends GenericTypeStmt<T>
10+
*/
11+
class TypeOffsetAccessNode extends GenericTypeStmt
12+
{
13+
public function __construct(
14+
TypeStatement $type,
15+
public readonly TypeStatement $access,
16+
) {
17+
parent::__construct($type);
18+
}
19+
}

‎src/Parser.php‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,8 @@ final class Parser implements ParserInterface
102102
* intersection types such as `T & U`
103103
* @param bool $list enables or disables support for square bracket list
104104
* types such as `T[]`
105+
* @param bool $offsets enables or disables support for square bracket
106+
* offset access types such as `T[U]`
105107
* @param bool $hints enables or disables support for template argument
106108
* hints such as `T<out U, in V>`
107109
* @param bool $attributes enables or disables support for attributes
@@ -117,6 +119,7 @@ public function __construct(
117119
public readonly bool $union = true,
118120
public readonly bool $intersection = true,
119121
public readonly bool $list = true,
122+
public readonly bool $offsets = true,
120123
public readonly bool $hints = true,
121124
public readonly bool $attributes = true,
122125
private readonly SourceFactoryInterface $sources = new SourceFactory(),

0 commit comments

Comments
 (0)