Skip to content

Support parsing php 8.0's non-capturing catch statement #322

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 27, 2020
Merged

Support parsing php 8.0's non-capturing catch statement #322

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion src/Node/CatchClause.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ class CatchClause extends Node {
* TODO: In the next backwards incompatible release, replace qualifiedName with qualifiedNameList?
*/
public $otherQualifiedNameList;
/** @var Token */
/** @var Token|null */
public $variableName;
/** @var Token */
public $closeParen;
Expand Down
2 changes: 1 addition & 1 deletion src/Parser.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2249,7 +2249,7 @@ private function parseCatchClause($parentNode) {
$qualifiedNameList = $this->parseQualifiedNameCatchList($catchClause)->children ?? [];
$catchClause->qualifiedName = $qualifiedNameList[0] ?? null; // TODO generate missing token or error if null
$catchClause->otherQualifiedNameList = array_slice($qualifiedNameList, 1); // TODO: Generate error if the name list has missing tokens
$catchClause->variableName = $this->eat1(TokenKind::VariableName);
$catchClause->variableName = $this->eatOptional1(TokenKind::VariableName);
$catchClause->closeParen = $this->eat1(TokenKind::CloseParenToken);
$catchClause->compoundStatement = $this->parseCompoundStatement($catchClause);

Expand Down
9 changes: 1 addition & 8 deletions tests/cases/parser/tryStatement10.php.diag
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1 @@
[
{
"kind": 0,
"message": "'VariableName' expected.",
"start": 22,
"length": 0
}
]
[]
6 changes: 1 addition & 5 deletions tests/cases/parser/tryStatement10.php.tree
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,7 @@
},
"qualifiedName": null,
"otherQualifiedNameList": [],
"variableName": {
"error": "MissingToken",
"kind": "VariableName",
"textLength": 0
},
"variableName": null,
"closeParen": {
"kind": "CloseParenToken",
"textLength": 1
Expand Down
6 changes: 0 additions & 6 deletions tests/cases/parser/tryStatement13.php.diag
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,4 @@
[
{
"kind": 0,
"message": "'VariableName' expected.",
"start": 169,
"length": 0
},
{
"kind": 0,
"message": "')' expected.",
Expand Down
6 changes: 1 addition & 5 deletions tests/cases/parser/tryStatement13.php.tree
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,7 @@
},
"qualifiedName": null,
"otherQualifiedNameList": [],
"variableName": {
"error": "MissingToken",
"kind": "VariableName",
"textLength": 0
},
"variableName": null,
"closeParen": {
"error": "MissingToken",
"kind": "CloseParenToken",
Expand Down
6 changes: 0 additions & 6 deletions tests/cases/parser/tryStatement8.php.diag
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,6 @@
"start": 21,
"length": 0
},
{
"kind": 0,
"message": "'VariableName' expected.",
"start": 21,
"length": 0
},
{
"kind": 0,
"message": "')' expected.",
Expand Down
6 changes: 1 addition & 5 deletions tests/cases/parser/tryStatement8.php.tree
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,7 @@
},
"qualifiedName": null,
"otherQualifiedNameList": [],
"variableName": {
"error": "MissingToken",
"kind": "VariableName",
"textLength": 0
},
"variableName": null,
"closeParen": {
"error": "MissingToken",
"kind": "CloseParenToken",
Expand Down
9 changes: 1 addition & 8 deletions tests/cases/parser/tryStatement9.php.diag
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1 @@
[
{
"kind": 0,
"message": "'VariableName' expected.",
"start": 27,
"length": 0
}
]
[]
6 changes: 1 addition & 5 deletions tests/cases/parser/tryStatement9.php.tree
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,7 @@
}
},
"otherQualifiedNameList": [],
"variableName": {
"error": "MissingToken",
"kind": "VariableName",
"textLength": 0
},
"variableName": null,
"closeParen": {
"kind": "CloseParenToken",
"textLength": 1
Expand Down