refactor

diff --git a/src/language/stats/ctables.c b/src/language/stats/ctables.c
index 2490efde10e9803917180b2f4981061161112c6d..5aa92f7e46ee6743d3b9611f0e7ba6783d47bd86 100644 (file)
--- a/src/language/stats/ctables.c
+++ b/src/language/stats/ctables.c
@@ -4665,32 +4665,6 @@ ctables_prepare_table (struct ctables_table *t)
                 nest->areas[at] = xmalloc (nest->n * sizeof *nest->areas[at]);
                 nest->n_areas[at] = 0;
 
-                bool add_vars = (at == CTAT_LAYER ? a == PIVOT_AXIS_LAYER
-                                 : at == CTAT_LAYERROW ? a != PIVOT_AXIS_COLUMN
-                                 : at == CTAT_LAYERCOL ? a != PIVOT_AXIS_ROW
-                                 : at == CTAT_TABLE ? false
-                                 : true);
-                if (add_vars)
-                  for (size_t k = 0; k < nest->n; k++)
-                    {
-                      if (k == nest->scale_idx)
-                        continue;
-                      nest->areas[at][nest->n_areas[at]++] = k;
-                    }
-                else if ((at == CTAT_LAYERCOL && a == PIVOT_AXIS_ROW && t->label_axis[a] != a)
-                         || (at == CTAT_LAYERROW && a == PIVOT_AXIS_COLUMN && t->label_axis[a] != a)
-                         || (at == CTAT_LAYER && t->label_axis[a] == PIVOT_AXIS_LAYER))
-                  {
-                    for (size_t k = nest->n - 1; k < nest->n; k--)
-                      {
-                        if (k == nest->scale_idx)
-                          continue;
-                        nest->areas[at][nest->n_areas[at]++] = k;
-                        break;
-                      }
-                    continue;
-                  }
-
                 enum pivot_axis_type ata, atb;
                 if (at == CTAT_ROW || at == CTAT_LAYERROW)
                   {
@@ -4703,8 +4677,33 @@ ctables_prepare_table (struct ctables_table *t)
                     atb = PIVOT_AXIS_ROW;
                   }
 
-                size_t n_drop = 0;
-                bool drop_inner = false;
+                if (((at == CTAT_LAYERCOL || at == CTAT_LAYERROW)
+                     && a == atb && t->label_axis[a] != a)
+                    || (at == CTAT_LAYER
+                        && a != PIVOT_AXIS_LAYER
+                        && t->label_axis[a] == PIVOT_AXIS_LAYER))
+                  {
+                    for (size_t k = nest->n - 1; k < nest->n; k--)
+                      if (k != nest->scale_idx)
+                        {
+                          nest->areas[at][nest->n_areas[at]++] = k;
+                          break;
+                        }
+                    continue;
+                  }
+
+                if (at == CTAT_LAYER ? a == PIVOT_AXIS_LAYER
+                    : at == CTAT_LAYERROW || at == CTAT_LAYERCOL ? a != atb
+                    : at == CTAT_TABLE ? false
+                    : true)
+                  for (size_t k = 0; k < nest->n; k++)
+                    {
+                      if (k == nest->scale_idx)
+                        continue;
+                      nest->areas[at][nest->n_areas[at]++] = k;
+                    }
+
+                int n_drop = 0;
                 switch (at)
                   {
                   case CTAT_SUBTABLE:
@@ -4713,7 +4712,7 @@ ctables_prepare_table (struct ctables_table *t)
                     else if (t->clabels_to_axis != PIVOT_AXIS_LAYER)
                       n_drop = a == t->clabels_from_axis ? 2 : 0;
                     else if (a == t->clabels_from_axis)
-                      drop_inner = true;
+                      n_drop = -1;
                     else
                       n_drop = a != PIVOT_AXIS_LAYER;
                     break;
@@ -4728,7 +4727,7 @@ ctables_prepare_table (struct ctables_table *t)
                     if (a == atb)
                       {
                         if (t->clabels_from_axis == atb)
-                          drop_inner = true;
+                          n_drop = -1;
                         else if (t->clabels_to_axis != atb)
                           n_drop = 1;
                       }
@@ -4741,7 +4740,7 @@ ctables_prepare_table (struct ctables_table *t)
                     break;
                   }
 
-                if (drop_inner)
+                if (n_drop < 0)
                   {
                     size_t n = nest->n_areas[at];
                     if (n > 1)
@@ -4750,9 +4749,12 @@ ctables_prepare_table (struct ctables_table *t)
                         nest->n_areas[at]--;
                       }
                   }
-                for (size_t i = 0; i < n_drop; i++)
-                  if (nest->n_areas[at] > 0)
-                    nest->n_areas[at]--;
+                else
+                  {
+                    for (int i = 0; i < n_drop; i++)
+                      if (nest->n_areas[at] > 0)
+                        nest->n_areas[at]--;
+                  }
               }
           }
       }