refacotring 2?

[pspp] / src / language / stats / ctables.c

diff --git a/src/language/stats/ctables.c b/src/language/stats/ctables.c
index aeae6223fc45db75643f608772fc39b3a4392db0..01c16cc1e98a14f3315fbb433b8e726be61c1c2b 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,20 +4677,41 @@ ctables_prepare_table (struct ctables_table *t)
                     atb = PIVOT_AXIS_ROW;
                   }
 
-                size_t n_drop = 0;
-                bool drop_inner = false;
+                if (at == CTAT_LAYER
+                    ? a != PIVOT_AXIS_LAYER && t->label_axis[a] == PIVOT_AXIS_LAYER
+                    : at == CTAT_LAYERCOL || at == CTAT_LAYERROW
+                    ? a == atb && t->label_axis[a] != a
+                    : false)
+                  {
+                    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 ? true
+                    : false)
+                  continue;
+
+                for (size_t k = 0; k < nest->n; k++)
+                  if (k != nest->scale_idx)
+                    nest->areas[at][nest->n_areas[at]++] = k;
+
+                int n_drop;
                 switch (at)
                   {
                   case CTAT_SUBTABLE:
-                    if (t->clabels_from_axis == PIVOT_AXIS_LAYER)
-                      n_drop = a != PIVOT_AXIS_LAYER;
-                    else if (t->clabels_to_axis != PIVOT_AXIS_LAYER)
-                      n_drop = a == t->clabels_from_axis ? 2 : 0;
-                    else
-                      {
-                        n_drop = a != PIVOT_AXIS_LAYER && a != t->clabels_from_axis;
-                        drop_inner = a == t->clabels_from_axis;
-                      }
+#define L PIVOT_AXIS_LAYER
+                    n_drop = (t->clabels_from_axis == L ? a != L
+                              : t->clabels_to_axis == L ? (a == t->clabels_from_axis ? -1 : a != L)
+                              : a == t->clabels_from_axis ? 2
+                              : 0);
+#undef L
                     break;
 
                   case CTAT_LAYERROW:
@@ -4726,19 +4721,11 @@ ctables_prepare_table (struct ctables_table *t)
 
                   case CTAT_ROW:
                   case CTAT_COL:
-                    if (a == atb)
-                      {
-                        if (t->label_axis[ata] == atb)
-                          ;
-                        else if (t->label_axis[atb] == ata)
-                          drop_inner = true;
-                        else if (t->label_axis[atb] == PIVOT_AXIS_LAYER)
-                          drop_inner = true;
-                        else
-                          n_drop = 1;
-                      }
-                    if (a == ata && t->label_axis[ata] == atb)
-                      n_drop++;
+                    n_drop = (a == ata ? t->label_axis[ata] == atb
+                              : a != atb ? 0
+                              : t->clabels_from_axis == atb ? -1
+                              : t->clabels_to_axis != atb ? 1
+                              : 0);
                     break;
 
                   case CTAT_LAYER:
@@ -4747,7 +4734,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)
@@ -4756,9 +4743,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]--;
+                  }
               }
           }
       }