From ff0dcae1d9a5aa5ae1b80164c49df264be1576b6 Mon Sep 17 00:00:00 2001 From: Ben Pfaff Date: Sat, 13 Aug 2022 21:49:56 -0700 Subject: [PATCH] refactoring --- src/language/stats/ctables.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/language/stats/ctables.c b/src/language/stats/ctables.c index 2b9e010bbe..fac05a9bc2 100644 --- a/src/language/stats/ctables.c +++ b/src/language/stats/ctables.c @@ -4740,7 +4740,7 @@ ctables_prepare_table (struct ctables_table *t) nest->n_areas[at]--; } } - continue; + n_drop = 0; } } else if (at == CTAT_SUBTABLE && t->label_axis[PIVOT_AXIS_COLUMN] == PIVOT_AXIS_LAYER) @@ -4758,11 +4758,11 @@ ctables_prepare_table (struct ctables_table *t) nest->n_areas[at]--; } } - continue; + n_drop = 0; } } else if (at == CTAT_ROW && a == PIVOT_AXIS_COLUMN && t->label_axis[PIVOT_AXIS_ROW] == PIVOT_AXIS_COLUMN) - continue; + n_drop = 0; else if (at == CTAT_COL && a == PIVOT_AXIS_ROW && t->label_axis[PIVOT_AXIS_ROW] == PIVOT_AXIS_COLUMN) { size_t n = nest->n_areas[at]; @@ -4771,7 +4771,7 @@ ctables_prepare_table (struct ctables_table *t) nest->areas[at][n - 2] = nest->areas[at][n - 1]; nest->n_areas[at]--; } - continue; + n_drop = 0; } else if (at == CTAT_COL && a == PIVOT_AXIS_ROW && t->label_axis[PIVOT_AXIS_COLUMN] == PIVOT_AXIS_ROW) continue; @@ -4783,7 +4783,7 @@ ctables_prepare_table (struct ctables_table *t) nest->areas[at][n - 2] = nest->areas[at][n - 1]; nest->n_areas[at]--; } - continue; + n_drop = 0; } else if (at == CTAT_COL && a == PIVOT_AXIS_ROW && t->label_axis[PIVOT_AXIS_ROW] == PIVOT_AXIS_LAYER) { @@ -4793,7 +4793,7 @@ ctables_prepare_table (struct ctables_table *t) nest->areas[at][n - 2] = nest->areas[at][n - 1]; nest->n_areas[at]--; } - continue; + n_drop = 0; } else if (at == CTAT_ROW && a == PIVOT_AXIS_COLUMN && t->label_axis[PIVOT_AXIS_COLUMN] == PIVOT_AXIS_LAYER) { @@ -4803,7 +4803,7 @@ ctables_prepare_table (struct ctables_table *t) nest->areas[at][n - 2] = nest->areas[at][n - 1]; nest->n_areas[at]--; } - continue; + n_drop = 0; } else { -- 2.30.2