Skip to content
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

Jump to bottom

Flatten unary expressions #491

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Flatten unary expressions #491

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
54b82c6
Flatten unary expressions
WebFreak001 Mar 23, 2023
54a6921
Fix isAssociativeArrayLiteral for CI
WebFreak001 Apr 5, 2023
c3bac5b
adjust to review
WebFreak001 Apr 5, 2023
ded6025
added missing tests
WebFreak001 Apr 7, 2023
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
368 changes: 319 additions & 49 deletions src/dparse/ast.d
View file
Open in desktop

Large diffs are not rendered by default.

36 changes: 14 additions & 22 deletions src/dparse/astprinter.d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -986,28 +986,6 @@ class XMLPrinter : ASTVisitor
}
}

override void visit(const UnaryExpression unaryExpression)
{
output.writeln("<unaryExpression>");
if (unaryExpression.prefix != tok!"")
{
output.writeln("<prefix>", xmlEscape(str(unaryExpression.prefix.type)), "</prefix>");
unaryExpression.unaryExpression.accept(this);
}
else
{
if (unaryExpression.suffix != tok!"")
{
assert(unaryExpression.suffix.text == "");
unaryExpression.unaryExpression.accept(this);
output.writeln("<suffix>", str(unaryExpression.suffix.type), "</suffix>");
}
else
unaryExpression.accept(this);
}
output.writeln("</unaryExpression>");
}

override void visit(const UnionDeclaration unionDeclaration)
{
output.writeln("<unionDeclaration line=\"", unionDeclaration.name.line, "\">");
Expand Down Expand Up @@ -1208,6 +1186,20 @@ class XMLPrinter : ASTVisitor
override void visit(const WhileStatement whileStatement) { mixin (tagAndAccept!"whileStatement"); }
override void visit(const WithStatement withStatement) { mixin (tagAndAccept!"withStatement"); }
override void visit(const TypeidExpression typeidExpression) { mixin (tagAndAccept!"typeidExpression"); }
// unary expressions
override void visit(const RefPrefixUnaryExpression refPrefixUnaryExpression) { mixin (tagAndAccept!"refPrefixUnaryExpression"); }
override void visit(const NotPrefixUnaryExpression notPrefixUnaryExpression) { mixin (tagAndAccept!"notPrefixUnaryExpression"); }
override void visit(const DerefPrefixUnaryExpression derefPrefixUnaryExpression) { mixin (tagAndAccept!"derefPrefixUnaryExpression"); }
override void visit(const PlusPrefixUnaryExpression plusPrefixUnaryExpression) { mixin (tagAndAccept!"plusPrefixUnaryExpression"); }
override void visit(const MinusPrefixUnaryExpression minusPrefixUnaryExpression) { mixin (tagAndAccept!"minusPrefixUnaryExpression"); }
override void visit(const TildePrefixUnaryExpression tildePrefixUnaryExpression) { mixin (tagAndAccept!"tildePrefixUnaryExpression"); }
override void visit(const PlusPlusPrefixUnaryExpression plusPlusPrefixUnaryExpression) { mixin (tagAndAccept!"plusPlusPrefixUnaryExpression"); }
override void visit(const MinusMinusPrefixUnaryExpression minusMinusPrefixUnaryExpression) { mixin (tagAndAccept!"minusMinusPrefixUnaryExpression"); }
override void visit(const PlusPlusPostfixUnaryExpression plusPlusPostfixUnaryExpression) { mixin (tagAndAccept!"plusPlusPostfixUnaryExpression"); }
override void visit(const MinusMinusPostfixUnaryExpression minusMinusPostfixUnaryExpression) { mixin (tagAndAccept!"minusMinusPostfixUnaryExpression"); }
override void visit(const UnaryDotIdentifierExpression unaryDotIdentifierExpression) { mixin (tagAndAccept!"unaryDotIdentifierExpression"); }
override void visit(const UnaryDotNewExpression unaryDotNewExpression) { mixin (tagAndAccept!"unaryDotNewExpression"); }
override void visit(const TypeDotIdentifierExpression typeDotIdentifierExpression) { mixin (tagAndAccept!"typeDotIdentifierExpression"); }
// dfmt on

alias visit = ASTVisitor.visit;
Expand Down
157 changes: 108 additions & 49 deletions src/dparse/formatter.d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -689,7 +689,7 @@
/**
Type type;
CastQualifier castQualifier;
UnaryExpression unaryExpression;
UnaryExpressionNode unaryExpression;
**/

with(castExpression)
Expand Down Expand Up @@ -1335,7 +1335,7 @@
else if (cast(TraitsExpression) n) format(cast(TraitsExpression) n);
else if (cast(TypeidExpression) n) format(cast(TypeidExpression) n);
else if (cast(TypeofExpression) n) format(cast(TypeofExpression) n);
else if (cast(UnaryExpression) n) format(cast(UnaryExpression) n);
else if (cast(UnaryExpressionNode) n) format(cast(UnaryExpressionNode) n);
else if (cast(XorExpression) n) format(cast(XorExpression) n);
}

Expand Down Expand Up @@ -1507,7 +1507,7 @@

/**
Type type;
UnaryExpression unaryExpression;
UnaryExpressionNode unaryExpression;
TemplateArguments templateArguments;
Arguments arguments;
**/
Expand Down Expand Up @@ -1891,7 +1891,7 @@
debug(verbose) writeln("IndexExpression");

/**
UnaryExpression unaryExpression;
UnaryExpressionNode unaryExpression;
ArgumentList argumentList;
**/

Expand Down Expand Up @@ -3611,59 +3611,115 @@
put(")");
}

void format(const UnaryExpression unary)
void format(const UnaryExpressionNode unary)
{
debug(verbose) writeln("UnaryExpressionNode(");

if (auto p = cast(RefPrefixUnaryExpression) unary) format(p);
else if (auto p = cast(NotPrefixUnaryExpression) unary) format(p);
else if (auto p = cast(DerefPrefixUnaryExpression) unary) format(p);
else if (auto p = cast(PlusPrefixUnaryExpression) unary) format(p);
else if (auto p = cast(MinusPrefixUnaryExpression) unary) format(p);
else if (auto p = cast(TildePrefixUnaryExpression) unary) format(p);
else if (auto p = cast(PlusPlusPrefixUnaryExpression) unary) format(p);
else if (auto p = cast(MinusMinusPrefixUnaryExpression) unary) format(p);
else if (auto p = cast(PlusPlusPostfixUnaryExpression) unary) format(p);
else if (auto p = cast(MinusMinusPostfixUnaryExpression) unary) format(p);
else if (auto p = cast(UnaryDotIdentifierExpression) unary) format(p);
else if (auto p = cast(UnaryDotNewExpression) unary) format(p);
else if (auto p = cast(TypeDotIdentifierExpression) unary) format(p);
else if (auto p = cast(AssertExpression) unary) format(p);
else if (auto p = cast(CastExpression) unary) format(p);
else if (auto p = cast(DeleteExpression) unary) format(p);
else if (auto p = cast(FunctionCallExpression) unary) format(p);
else if (auto p = cast(IndexExpression) unary) format(p);
else if (auto p = cast(NewExpression) unary) format(p);
else if (auto p = cast(PrimaryExpression) unary) format(p);
else if (auto p = cast(ThrowExpression) unary) format(p);

debug(verbose) writeln(")");
}

void format(const RefPrefixUnaryExpression unary)
{
debug(verbose) writeln("UnaryExpression(");
put("&");
format(unary.unaryExpression);
}

/**
Type type;
PrimaryExpression primaryExpression;
Token prefix;
Token suffix;
UnaryExpression unaryExpression;
NewExpression newExpression;
DeleteExpression deleteExpression;
CastExpression castExpression;
FunctionCallExpression functionCallExpression;
ArgumentList argumentList;
IdentifierOrTemplateInstance identifierOrTemplateInstance;
AssertExpression assertExpression;
SliceExpression sliceExpression;
IndexExpression indexExpression;
**/
void format(const NotPrefixUnaryExpression unary)
{
put("!");
format(unary.unaryExpression);

Check warning on line 3652 in src/dparse/formatter.d

View check run for this annotation

Codecov / codecov/patch

src/dparse/formatter.d#L3651-L3652 

Added lines #L3651 - L3652 were not covered by tests
}

with(unary)
{
if (prefix != tok!"") format(prefix);
void format(const DerefPrefixUnaryExpression unary)
{
put("*");
format(unary.unaryExpression);
}

if (type && identifierOrTemplateInstance)
{
// handle things like (void*).sizeof
put("(");
format(type);
put(")");
}
void format(const PlusPrefixUnaryExpression unary)
{
put("+");
format(unary.unaryExpression);

Check warning on line 3664 in src/dparse/formatter.d

View check run for this annotation

Codecov / codecov/patch

src/dparse/formatter.d#L3663-L3664 

Added lines #L3663 - L3664 were not covered by tests
}

if (primaryExpression) format(primaryExpression);
if (newExpression) format(newExpression);
if (deleteExpression) format(deleteExpression);
if (castExpression) format(castExpression);
if (functionCallExpression) format(functionCallExpression);
if (assertExpression) format(assertExpression);
if (throwExpression) format(throwExpression);
if (indexExpression) format(indexExpression);
void format(const MinusPrefixUnaryExpression unary)
{
put("-");
format(unary.unaryExpression);

Check warning on line 3670 in src/dparse/formatter.d

View check run for this annotation

Codecov / codecov/patch

src/dparse/formatter.d#L3669-L3670 

Added lines #L3669 - L3670 were not covered by tests
}

if (unaryExpression) format(unaryExpression);
if (suffix != tok!"") format(suffix);
void format(const TildePrefixUnaryExpression unary)
{
put("~");
format(unary.unaryExpression);
}

if (identifierOrTemplateInstance)
{
put(".");
format(identifierOrTemplateInstance);
}
}
void format(const PlusPlusPrefixUnaryExpression unary)
{
put("++");
format(unary.unaryExpression);

Check warning on line 3682 in src/dparse/formatter.d

View check run for this annotation

Codecov / codecov/patch

src/dparse/formatter.d#L3681-L3682 

Added lines #L3681 - L3682 were not covered by tests
}

debug(verbose) writeln(")");
void format(const MinusMinusPrefixUnaryExpression unary)
{
put("--");
format(unary.unaryExpression);

Check warning on line 3688 in src/dparse/formatter.d

View check run for this annotation

Codecov / codecov/patch

src/dparse/formatter.d#L3687-L3688 

Added lines #L3687 - L3688 were not covered by tests
}

void format(const PlusPlusPostfixUnaryExpression unary)
{
format(unary.unaryExpression);
put("++");

Check warning on line 3694 in src/dparse/formatter.d

View check run for this annotation

Codecov / codecov/patch

src/dparse/formatter.d#L3693-L3694 

Added lines #L3693 - L3694 were not covered by tests
}

void format(const MinusMinusPostfixUnaryExpression unary)
{
format(unary.unaryExpression);
put("--");

Check warning on line 3700 in src/dparse/formatter.d

View check run for this annotation

Codecov / codecov/patch

src/dparse/formatter.d#L3699-L3700 

Added lines #L3699 - L3700 were not covered by tests
}

void format(const UnaryDotIdentifierExpression unary)
{
format(unary.unaryExpression);
put(".");
format(unary.identifierOrTemplateInstance);
}

void format(const UnaryDotNewExpression unary)
{
format(unary.unaryExpression);
put(".");
format(unary.newExpression);

Check warning on line 3714 in src/dparse/formatter.d

View check run for this annotation

Codecov / codecov/patch

src/dparse/formatter.d#L3712-L3714 

Added lines #L3712 - L3714 were not covered by tests
}

void format(const TypeDotIdentifierExpression unary)
{
put("(");
format(unary.type);
put(").");
format(unary.identifierOrTemplateInstance);

Check warning on line 3722 in src/dparse/formatter.d

View check run for this annotation

Codecov / codecov/patch

src/dparse/formatter.d#L3719-L3722 

Added lines #L3719 - L3722 were not covered by tests
}

void format(const UnionDeclaration decl, const Attribute[] attrs = null)
Expand Down Expand Up @@ -4183,6 +4239,9 @@
testFormatNode!(VariableDeclaration)(`T!(0)[] t;`);
testFormatNode!(VariableDeclaration)(`T!(0)[dim] t;`);
testFormatNode!(VariableDeclaration)(`const shared t = [0, 1];`);
testFormatNode!(VariableDeclaration)(`auto x = foo();`);
testFormatNode!(VariableDeclaration)(`auto x = foo("bar");`);
testFormatNode!(VariableDeclaration)(`auto x = foo(baz: "bar");`);

testFormatNode!(OutStatement)(
`
Expand Down
Loading
Loading