Skip to content

Fixes #188: Fix parsing empty variables #233

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
Feb 19, 2018
Merged

Fixes #188: Fix parsing empty variables #233

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
18 changes: 13 additions & 5 deletions src/Parser.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2066,10 +2066,19 @@ private function parseSimpleVariableFn() {
$variable->dollar = $this->eat1(TokenKind::DollarToken);
$token = $this->getCurrentToken();

$variable->name =
$token->kind === TokenKind::OpenBraceToken ?
$this->parseBracedExpression($variable) :
$this->parseSimpleVariable($variable);
switch ($token->kind) {
case TokenKind::OpenBraceToken:
$variable->name = $this->parseBracedExpression($variable);
break;
case TokenKind::VariableName:
case TokenKind::StringVarname:
case TokenKind::DollarToken:
$variable->name = $this->parseSimpleVariable($variable);
break;
default:
$variable->name = new MissingToken(TokenKind::VariableName, $token->fullStart);
break;
}
} elseif ($token->kind === TokenKind::VariableName || $token->kind === TokenKind::StringVarname) {
// TODO consider splitting into dollar and name.
// StringVarname is the variable name without $, used in a template string e.g. `"${foo}"`
Expand All @@ -2089,7 +2098,6 @@ private function parseYieldExpression($parentNode) {
TokenKind::YieldFromKeyword,
TokenKind::YieldKeyword
);

$yieldExpression->arrayElement = $this->parseArrayElement($yieldExpression);
return $yieldExpression;
}
Expand Down
3 changes: 3 additions & 0 deletions tests/cases/parser/variables6.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
<?php

$x = $;
8 changes: 8 additions & 0 deletions tests/cases/parser/variables6.php.diag
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
[
{
"kind": 0,
"message": "'VariableName' expected.",
"start": 13,
"length": 0
}
]
59 changes: 59 additions & 0 deletions tests/cases/parser/variables6.php.tree
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
{
"SourceFileNode": {
"statementList": [
{
"InlineHtml": {
"scriptSectionEndTag": null,
"text": null,
"scriptSectionStartTag": {
"kind": "ScriptSectionStartTag",
"textLength": 6
}
}
},
{
"ExpressionStatement": {
"expression": {
"AssignmentExpression": {
"leftOperand": {
"Variable": {
"dollar": null,
"name": {
"kind": "VariableName",
"textLength": 2
}
}
},
"operator": {
"kind": "EqualsToken",
"textLength": 1
},
"byRef": null,
"rightOperand": {
"Variable": {
"dollar": {
"kind": "DollarToken",
"textLength": 1
},
"name": {
"error": "MissingToken",
"kind": "VariableName",
"textLength": 0
}
}
}
}
},
"semicolon": {
"kind": "SemicolonToken",
"textLength": 1
}
}
}
],
"endOfFileToken": {
"kind": "EndOfFileToken",
"textLength": 0
}
}
}