Commit a7c3d4f

committed

Simplify parsing of type alias import

1 parent 4a07085 commit a7c3d4fCopy full SHA for a7c3d4f

File tree

-10

lines changed

-10

lines changed

Lines changed: 1 addition & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -429,14 +429,7 @@ private function parseTypeAliasImportTagValue(TokenIterator $tokens): Ast\PhpDoc`
`429`	`429`	`$importedAlias = $tokens->currentTokenValue();`
`430`	`430`	`$tokens->consumeTokenType(Lexer::TOKEN_IDENTIFIER);`
`431`	`431`
`432`		`- if (!$tokens->tryConsumeTokenValue('from')) {`
`433`		`- throw new ParserException(`
`434`		`- $tokens->currentTokenValue(),`
`435`		`- $tokens->currentTokenType(),`
`436`		`- $tokens->currentTokenOffset(),`
`437`		`- Lexer::TOKEN_IDENTIFIER`
`438`		`- );`
`439`		`- }`
	`432`	`+ $tokens->consumeTokenValue(Lexer::TOKEN_IDENTIFIER, 'from');`
`440`	`433`
`441`	`434`	`$importedFrom = $tokens->currentTokenValue();`
`442`	`435`	`$tokens->consumeTokenType(Lexer::TOKEN_IDENTIFIER);`

Lines changed: 4 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -3679,7 +3679,8 @@ public function provideTypeAliasImportTagsData(): Iterator`
`3679`	`3679`	`'*/',`
`3680`	`3680`	`Lexer::TOKEN_CLOSE_PHPDOC,`
`3681`	`3681`	`35,`
`3682`		`- Lexer::TOKEN_IDENTIFIER`
	`3682`	`+ Lexer::TOKEN_IDENTIFIER,`
	`3683`	`+ 'from'`
`3683`	`3684`	`)`
`3684`	`3685`	`)`
`3685`	`3686`	`),`
`@@ -3698,7 +3699,8 @@ public function provideTypeAliasImportTagsData(): Iterator`
`3698`	`3699`	`'as',`
`3699`	`3700`	`Lexer::TOKEN_IDENTIFIER,`
`3700`	`3701`	`35,`
`3701`		`- Lexer::TOKEN_IDENTIFIER`
	`3702`	`+ Lexer::TOKEN_IDENTIFIER,`
	`3703`	`+ 'from'`
`3702`	`3704`	`)`
`3703`	`3705`	`)`
`3704`	`3706`	`),`

Comments

(0)