Pretty-print an ordinary "else if" together without more indenting

Author: hsutter

regression-tests/test-results/pure2-autodiff.cpp2.output

@@ -1396,16 +1396,13 @@ ad_test_2:/* @autodiff<"order=2"> @print */ type =
         {
             y = x * x;
         }
+        else if x < 3
+        {
+            y = x + sin(x) + 10;
+        }
         else 
         {
-            if x < 3
-            {
-                y = x + sin(x) + 10;
-            }
-            else 
-            {
-                y = sin(x) * x * x;
-            }
+            y = sin(x) * x * x;
         }
         return;
     }
@@ -1423,24 +1420,21 @@ ad_test_2:/* @autodiff<"order=2"> @print */ type =
             y_d = x_d..mul(x_d, x, x);
             y = x * x;
         }
+        else if x < 3
+        {
+            temp_1_d: cpp2::taylor<double, 2> = x_d.sin(x);
+            temp_1: double = sin(x);
+            y_d = x_d + temp_1_d;
+            y = x + temp_1 + 10;
+        }
         else 
         {
-            if x < 3
-            {
-                temp_1_d: cpp2::taylor<double, 2> = x_d.sin(x);
-                temp_1: double = sin(x);
-                y_d = x_d + temp_1_d;
-                y = x + temp_1 + 10;
-            }
-            else 
-            {
-                temp_3_d: cpp2::taylor<double, 2> = x_d.sin(x);
-                temp_3: double = sin(x);
-                temp_4_d: _ = temp_3_d..mul(x_d, temp_3, x);
-                temp_4: _ = temp_3 * x;
-                y_d = temp_4_d..mul(x_d, temp_4, x);
-                y = temp_4 * x;
-            }
+            temp_3_d: cpp2::taylor<double, 2> = x_d.sin(x);
+            temp_3: double = sin(x);
+            temp_4_d: _ = temp_3_d..mul(x_d, temp_3, x);
+            temp_4: _ = temp_3 * x;
+            y_d = temp_4_d..mul(x_d, temp_4, x);
+            y = temp_4 * x;
         }
         return;
     }

regression-tests/test-results/pure2-print.cpp2.output

@@ -64,16 +64,13 @@ outer:/* @print */ type =
             {
                 a();
             }
+            else if !m.empty()
+            {
+                b();
+            }
             else 
             {
-                if !m.empty()
-                {
-                    b();
-                }
-                else 
-                {
-                    c();
-                }
+                c();
             }
             assert( true );
             return :() -> move std::string = (s + m[0])$;();

source/parse.h

@@ -5453,9 +5453,9 @@ auto pretty_print_visualize(is_as_expression_node const& n, int indent)
     -> std::string;
 auto pretty_print_visualize(id_expression_node const& n, int indent)
     -> std::string;
-auto pretty_print_visualize(compound_statement_node const& n, int indent)
+auto pretty_print_visualize(compound_statement_node const& n, int indent, bool after_else = false)
     -> std::string;
-auto pretty_print_visualize(selection_statement_node const& n, int indent)
+auto pretty_print_visualize(selection_statement_node const& n, int indent, bool no_indent = false)
     -> std::string;
 auto pretty_print_visualize(iteration_statement_node const& n, int indent)
     -> std::string;
@@ -5471,7 +5471,7 @@ auto pretty_print_visualize(jump_statement_node const& n, int indent)
     -> std::string;
 auto pretty_print_visualize(using_statement_node const& n, int indent)
     -> std::string;
-auto pretty_print_visualize(statement_node const& n, int indent)
+auto pretty_print_visualize(statement_node const& n, int indent, bool no_indent = false)
     -> std::string;
 auto pretty_print_visualize(parameter_declaration_node const& n, int indent, bool is_template_param = false)
     -> std::string;
@@ -5837,30 +5837,51 @@ auto pretty_print_visualize(id_expression_node const& n, int indent)
 }
 
 
-auto pretty_print_visualize(compound_statement_node const& n, int indent)
+auto pretty_print_visualize(compound_statement_node const& n, int indent, bool after_else /* = false */ )
     -> std::string
 {
-    auto ret = std::string{"\n"} + pre(indent) + "{";
+    auto ret = std::string{};
 
-    for (auto& stmt : n.statements) {
-        assert (stmt);
-        ret += pretty_print_visualize(*stmt, indent+1);
+    //  If this is just a plain "if" right after an "else", pull them together visually
+    if (
+        after_else
+        && std::ssize(n.statements) == 1
+        && n.statements[0]
+        && n.statements[0]->is_selection()
+        && n.statements[0]->get_parameters().empty()
+        )
+    {
+        ret += pretty_print_visualize(*n.statements[0], indent, true);
     }
 
-    ret += std::string{"\n"} + pre(indent) + "}";
+    else
+    {
+        ret += std::string{"\n"} + pre(indent) + "{";
+
+        for (auto& stmt : n.statements) {
+            assert (stmt);
+            ret += pretty_print_visualize(*stmt, indent+1);
+        }
+
+        ret += std::string{"\n"} + pre(indent) + "}";
+    }
 
     return ret;
 }
 
 
-auto pretty_print_visualize(selection_statement_node const& n, int indent)
+auto pretty_print_visualize(selection_statement_node const& n, int indent, bool no_indent /* = false */)
     -> std::string
 {
     assert (n.identifier && n.expression && n.true_branch && n.false_branch);
 
     auto ret = std::string{};
 
-    ret += std::string{"\n"} + pre(indent) + n.identifier->as_string_view() + " ";
+    if (!no_indent) {
+        ret += std::string{"\n"} + pre(indent);
+    }
+    ret += n.identifier->as_string_view();
+    ret += " ";
 
     if (n.is_constexpr) {
         ret += "constexpr ";
@@ -5871,7 +5892,7 @@ auto pretty_print_visualize(selection_statement_node const& n, int indent)
 
     if (n.has_source_false_branch) {
         ret += std::string{"\n"} + pre(indent) + "else "
-            + pretty_print_visualize(*n.false_branch, indent);
+            + pretty_print_visualize(*n.false_branch, indent, true);
     }
 
     return ret;
@@ -6076,7 +6097,7 @@ auto pretty_print_visualize(using_statement_node const& n, int indent)
 }
 
 
-auto pretty_print_visualize(statement_node const& n, int indent)
+auto pretty_print_visualize(statement_node const& n, int indent, bool no_indent /* = false */ )
     -> std::string
 {
     auto ret = std::string{};
@@ -6097,7 +6118,7 @@ auto pretty_print_visualize(statement_node const& n, int indent)
         }
 
         ret += try_pretty_print_visualize<statement_node::compound   >(n.statement, indent);
-        ret += try_pretty_print_visualize<statement_node::selection  >(n.statement, indent);
+        ret += try_pretty_print_visualize<statement_node::selection  >(n.statement, indent, no_indent);
         ret += try_pretty_print_visualize<statement_node::declaration>(n.statement, indent);
         ret += try_pretty_print_visualize<statement_node::return_    >(n.statement, indent);
         ret += try_pretty_print_visualize<statement_node::iteration  >(n.statement, indent);