refactor

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

diff --git a/src/language/stats/ctables.c b/src/language/stats/ctables.c
index 5aa92f7e46ee6743d3b9611f0e7ba6783d47bd86..e78c0cf169d504524636a41db64c4aca40d55c7d 100644 (file)
--- a/src/language/stats/ctables.c
+++ b/src/language/stats/ctables.c
@@ -4677,11 +4677,11 @@ ctables_prepare_table (struct ctables_table *t)
                     atb = PIVOT_AXIS_ROW;
                   }
 
-                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))
+                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)
@@ -4692,18 +4692,17 @@ ctables_prepare_table (struct ctables_table *t)
                     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;
-                    }
+                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 = 0;
+                int n_drop;
                 switch (at)
                   {
                   case CTAT_SUBTABLE:
@@ -4724,19 +4723,21 @@ ctables_prepare_table (struct ctables_table *t)
 
                   case CTAT_ROW:
                   case CTAT_COL:
-                    if (a == atb)
-                      {
-                        if (t->clabels_from_axis == atb)
-                          n_drop = -1;
-                        else if (t->clabels_to_axis != atb)
-                          n_drop = 1;
-                      }
-                    else if (a == ata)
+                    if (a == ata)
                       n_drop = t->label_axis[ata] == atb;
+                    else if (a != atb)
+                      n_drop = 0;
+                    else if (t->clabels_from_axis == atb)
+                      n_drop = -1;
+                    else if (t->clabels_to_axis != atb)
+                      n_drop = 1;
+                    else
+                      n_drop = 0;
                     break;
 
                   case CTAT_LAYER:
                   case CTAT_TABLE:
+                    n_drop = 0;
                     break;
                   }