[lmi-commits] [lmi] master 80e2375 1/3: Linearize control flow

[Greg Chicares]

branch: master
commit 80e2375d6bc31ee1844d1a43fbcc0f04ccde8231
Author: Gregory W. Chicares <address@hidden>
Commit: Gregory W. Chicares <address@hidden>

    Linearize control flow
    
    See:
      https://lists.nongnu.org/archive/html/lmi/2018-08/msg00001.html
---
 ledger_pdf_generator_wx.cpp | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/ledger_pdf_generator_wx.cpp b/ledger_pdf_generator_wx.cpp
index 7884394..f970fdc 100644
--- a/ledger_pdf_generator_wx.cpp
+++ b/ledger_pdf_generator_wx.cpp
@@ -1482,6 +1482,13 @@ class numeric_summary_table_cell
 
                         std::string const variable_name = 
columns[j].variable_name;
 
+                        // Special hack for the dummy columns whose value is 
always
+                        // empty as it's used only as separator.
+                        output_values[j] = variable_name.empty()
+                            ? std::string{}
+                            : interpolate_html.evaluate(variable_name, year - 
1)
+                            ;
+
                         // The illustration reg calls for values at certain
                         // durations, and then at one summary age, so change
                         // beginning of last row from a duration to an age.
@@ -1492,16 +1499,8 @@ class numeric_summary_table_cell
                                 std::ostringstream oss;
                                 oss << "Age " << age_last;
                                 output_values[j] = oss.str();
-                                continue;
                                 }
                             }
-
-                        // Special hack for the dummy columns whose value is 
always
-                        // empty as it's used only as separator.
-                        output_values[j] = variable_name.empty()
-                            ? std::string{}
-                            : interpolate_html.evaluate(variable_name, year - 
1)
-                            ;
                         }
 
                     std::vector<std::string> visible_values;