From 61b448b551646f2032afc6e71db4b06c8f256f26 Mon Sep 17 00:00:00 2001 From: Daniel Zuncke Date: Sun, 22 Oct 2023 09:08:55 +0200 Subject: [PATCH] Ternary expr. now visited recursively --- src/dfmt/ast_info.d | 1 + tests/allman/issue0578.d.ref | 35 ----------------------------------- tests/issue0578.d | 35 ----------------------------------- tests/knr/issue0578.d.ref | 35 ----------------------------------- tests/otbs/issue0578.d.ref | 35 ----------------------------------- 5 files changed, 1 insertion(+), 140 deletions(-) diff --git a/src/dfmt/ast_info.d b/src/dfmt/ast_info.d index 88dbdff..6ba0f24 100644 --- a/src/dfmt/ast_info.d +++ b/src/dfmt/ast_info.d @@ -445,6 +445,7 @@ final class FormatVisitor : ASTVisitor override void visit(const TernaryExpression ternaryExpression) { astInformation.ternaryColonLocations ~= ternaryExpression.colon.index; + ternaryExpression.accept(this); } private: diff --git a/tests/allman/issue0578.d.ref b/tests/allman/issue0578.d.ref index 67284f7..74fd32b 100644 --- a/tests/allman/issue0578.d.ref +++ b/tests/allman/issue0578.d.ref @@ -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]; - ^ - +/ } diff --git a/tests/issue0578.d b/tests/issue0578.d index 24e818f..6e6ea21 100644 --- a/tests/issue0578.d +++ b/tests/issue0578.d @@ -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]; - ^ - +/ } diff --git a/tests/knr/issue0578.d.ref b/tests/knr/issue0578.d.ref index 67284f7..74fd32b 100644 --- a/tests/knr/issue0578.d.ref +++ b/tests/knr/issue0578.d.ref @@ -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]; - ^ - +/ } diff --git a/tests/otbs/issue0578.d.ref b/tests/otbs/issue0578.d.ref index 1dbb893..9f97fa7 100644 --- a/tests/otbs/issue0578.d.ref +++ b/tests/otbs/issue0578.d.ref @@ -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]; - ^ - +/ }