Skip to content

Add support for the new alias this declaration syntax #534

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

Open
bangbangsheshotmedown wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add support for the new alias this declaration syntax #534

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
21 changes: 16 additions & 5 deletions src/dparse/parser.d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,17 +282,27 @@ class Parser
* Parses an AliasThisDeclaration.
*
* $(GRAMMAR $(RULEDEF aliasThisDeclaration):
* $(LITERAL 'alias') $(LITERAL Identifier) $(LITERAL 'this') $(LITERAL ';')
* ;)
* $(LITERAL 'alias') $(LITERAL Identifier) $(LITERAL 'this') $(LITERAL ';')
* | $(LITERAL 'alias') $(LITERAL 'this') $(LITERAL '=') $(LITERAL Identifier) $(LITERAL ';')
* ;)
*/
AliasThisDeclaration parseAliasThisDeclaration()
{
mixin(traceEnterAndExit!(__FUNCTION__));
auto startIndex = index;
auto node = allocator.make!AliasThisDeclaration;
mixin(tokenCheck!"alias");
mixin(tokenCheck!(`node.identifier`, "identifier"));
mixin(tokenCheck!"this");
if (currentIs(tok!"this"))
{
advance();
mixin(tokenCheck!"=");
mixin(tokenCheck!(`node.identifier`, "identifier"));
}
else
{
mixin(tokenCheck!(`node.identifier`, "identifier"));
mixin(tokenCheck!"this");
}
return attachCommentFromSemicolon(node, startIndex);
}

Expand Down Expand Up @@ -2315,7 +2325,8 @@ class Parser
mixin(tokenCheck!"}");
break;
case tok!"alias":
if (startsWith(tok!"alias", tok!"identifier", tok!"this"))
if (startsWith(tok!"alias", tok!"identifier", tok!"this")
|| startsWith(tok!"alias", tok!"this", tok!"="))
mixin(parseNodeQ!(`node.aliasThisDeclaration`, `AliasThisDeclaration`));
else
mixin(parseNodeQ!(`node.aliasDeclaration`, `AliasDeclaration`));
Expand Down
Loading