forks
/
dfmt
mirror of https://github.com/dlang-community/dfmt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Ternary expr. now visited recursively

This commit is contained in:
Daniel Zuncke 2023-10-22 09:08:55 +02:00
parent 0b3946f9f5
commit 61b448b551
No known key found for this signature in database
GPG Key ID: A2A8C43610B6B485
5 changed files with 1 additions and 140 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/dfmt/ast_info.d
View File

@ -445,6 +445,7 @@ final class FormatVisitor : ASTVisitor
override void visit(const TernaryExpression ternaryExpression)
{
astInformation.ternaryColonLocations ~= ternaryExpression.colon.index;
ternaryExpression.accept(this);
}
private:

35
tests/allman/issue0578.d.ref
View File

@ -4,40 +4,5 @@ void f()
auto a = [true ? 1 : 0];
auto aa1 = [0: true ? 1 : 0];
auto aa2 = [0: true ? (false ? 1 : 2) : 3];
auto aa3 = [0: true ? false ? 1: 2 : 3];
/+
READ IF THIS TEST FAILS
Bug in dparse:
(Formatting before fix issue 578)
int[int] aa3 = [0: true ? false ? 1: 2: 3];
^
EXPLANATION:
The marked colon is not is not recognized as a TernaryExpression by
dparse:
If you write a `writeln(ternaryExpression.colon.index)` in the overloaded
ASTInformation visit function, which should get called once for every
encountered ternary colon, only the second index is printed:
override void visit(const TernaryExpression ternaryExpression) { ... }
This bug can be ignored (formatting error is localized and should be rarely
encountered).
FIX:
Should this get fixed by dparse or when the migration to dmd is completed,
the formatting in the .ref files can be updated to the correct one and this
comment can be removed.
Current formatting after applying fix issue 578:
auto aa3 = [0: true ? false ? 1: 2 : 3];
^
Correct formatting after fix dparse:
auto aa3 = [0: true ? false ? 1 : 2 : 3];
^
+/
}

35
tests/issue0578.d
View File

@ -4,40 +4,5 @@ void f()
auto a = [true ? 1: 0];
auto aa1 = [0: true ? 1: 0];
auto aa2 = [0: true ? (false ? 1: 2): 3];
auto aa3 = [0: true ? false ? 1: 2: 3];
/+
READ IF THIS TEST FAILS
Bug in dparse:
(Formatting before fix issue 578)
int[int] aa3 = [0: true ? false ? 1: 2: 3];
^
EXPLANATION:
The marked colon is not is not recognized as a TernaryExpression by
dparse:
If you write a `writeln(ternaryExpression.colon.index)` in the overloaded
ASTInformation visit function, which should get called once for every
encountered ternary colon, only the second index is printed:
override void visit(const TernaryExpression ternaryExpression) { ... }
This bug can be ignored (formatting error is localized and should be rarely
encountered).
FIX:
Should this get fixed by dparse or when the migration to dmd is completed,
the formatting in the .ref files can be updated to the correct one and this
comment can be removed.
Current formatting after applying fix issue 578:
auto aa3 = [0: true ? false ? 1: 2 : 3];
^
Correct formatting after fix dparse:
auto aa3 = [0: true ? false ? 1 : 2 : 3];
^
+/
}

35
tests/knr/issue0578.d.ref
View File

@ -4,40 +4,5 @@ void f()
auto a = [true ? 1 : 0];
auto aa1 = [0: true ? 1 : 0];
auto aa2 = [0: true ? (false ? 1 : 2) : 3];
auto aa3 = [0: true ? false ? 1: 2 : 3];
/+
READ IF THIS TEST FAILS
Bug in dparse:
(Formatting before fix issue 578)
int[int] aa3 = [0: true ? false ? 1: 2: 3];
^
EXPLANATION:
The marked colon is not is not recognized as a TernaryExpression by
dparse:
If you write a `writeln(ternaryExpression.colon.index)` in the overloaded
ASTInformation visit function, which should get called once for every
encountered ternary colon, only the second index is printed:
override void visit(const TernaryExpression ternaryExpression) { ... }
This bug can be ignored (formatting error is localized and should be rarely
encountered).
FIX:
Should this get fixed by dparse or when the migration to dmd is completed,
the formatting in the .ref files can be updated to the correct one and this
comment can be removed.
Current formatting after applying fix issue 578:
auto aa3 = [0: true ? false ? 1: 2 : 3];
^
Correct formatting after fix dparse:
auto aa3 = [0: true ? false ? 1 : 2 : 3];
^
+/
}

35
tests/otbs/issue0578.d.ref
View File

@ -3,40 +3,5 @@ void f() {
auto a = [true ? 1 : 0];
auto aa1 = [0: true ? 1 : 0];
auto aa2 = [0: true ? (false ? 1 : 2) : 3];
auto aa3 = [0: true ? false ? 1: 2 : 3];
/+
READ IF THIS TEST FAILS
Bug in dparse:
(Formatting before fix issue 578)
int[int] aa3 = [0: true ? false ? 1: 2: 3];
^
EXPLANATION:
The marked colon is not is not recognized as a TernaryExpression by
dparse:
If you write a `writeln(ternaryExpression.colon.index)` in the overloaded
ASTInformation visit function, which should get called once for every
encountered ternary colon, only the second index is printed:
override void visit(const TernaryExpression ternaryExpression) { ... }
This bug can be ignored (formatting error is localized and should be rarely
encountered).
FIX:
Should this get fixed by dparse or when the migration to dmd is completed,
the formatting in the .ref files can be updated to the correct one and this
comment can be removed.
Current formatting after applying fix issue 578:
auto aa3 = [0: true ? false ? 1: 2 : 3];
^
Correct formatting after fix dparse:
auto aa3 = [0: true ? false ? 1 : 2 : 3];
^
+/
}