refactor

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

diff --git a/src/language/stats/ctables.c b/src/language/stats/ctables.c
index ff8f1abbc0a6f0f95b7f8a3b40f620507b0f8a37..6d3f44d327d10410898127ef171c497c52d6cbce 100644 (file)
--- a/src/language/stats/ctables.c
+++ b/src/language/stats/ctables.c
@@ -4694,51 +4694,61 @@ ctables_prepare_table (struct ctables_table *t)
                 size_t n_drop;
                 bool drop_inner = false;
                 if (at == CTAT_SUBTABLE
-                    && t->clabels_from_axis != PIVOT_AXIS_LAYER
-                    && t->clabels_to_axis != PIVOT_AXIS_LAYER)
-                  n_drop = a == t->clabels_from_axis ? 2 : 0;
-                else if (at == CTAT_SUBTABLE
-                         && t->clabels_from_axis != PIVOT_AXIS_LAYER
-                         && t->clabels_to_axis == PIVOT_AXIS_LAYER)
+                    && t->clabels_from_axis != PIVOT_AXIS_LAYER)
                   {
-                    drop_inner = a == t->clabels_from_axis;
-                    n_drop = a != t->clabels_from_axis && a != PIVOT_AXIS_LAYER;
+                    if (t->clabels_to_axis != PIVOT_AXIS_LAYER)
+                      n_drop = a == t->clabels_from_axis ? 2 : 0;
+                    else
+                      {
+                        drop_inner = a == t->clabels_from_axis;
+                        n_drop = a != t->clabels_from_axis && a != PIVOT_AXIS_LAYER;
+                      }
                   }
                 else if (at == CTAT_ROW && a == PIVOT_AXIS_COLUMN && t->label_axis[PIVOT_AXIS_ROW] == PIVOT_AXIS_COLUMN)
                   n_drop = 0;
-                else if (at == CTAT_COL && a == PIVOT_AXIS_ROW && t->label_axis[PIVOT_AXIS_ROW] == PIVOT_AXIS_COLUMN)
+                else if (at == CTAT_ROW && a == PIVOT_AXIS_COLUMN && t->label_axis[PIVOT_AXIS_COLUMN] == PIVOT_AXIS_ROW)
                   {
                     drop_inner = true;
                     n_drop = 0;
                   }
-                else if (at == CTAT_COL && a == PIVOT_AXIS_ROW && t->label_axis[PIVOT_AXIS_COLUMN] == PIVOT_AXIS_ROW)
-                  n_drop = 0;
-                else if (at == CTAT_ROW && a == PIVOT_AXIS_COLUMN && t->label_axis[PIVOT_AXIS_COLUMN] == PIVOT_AXIS_ROW)
+                else if (at == CTAT_ROW && a == PIVOT_AXIS_COLUMN && t->label_axis[PIVOT_AXIS_COLUMN] == PIVOT_AXIS_LAYER)
                   {
                     drop_inner = true;
                     n_drop = 0;
                   }
-                else if (at == CTAT_COL && a == PIVOT_AXIS_ROW && t->label_axis[PIVOT_AXIS_ROW] == PIVOT_AXIS_LAYER)
+                else if (at == CTAT_COL && a == PIVOT_AXIS_ROW && t->label_axis[PIVOT_AXIS_ROW] == PIVOT_AXIS_COLUMN)
                   {
                     drop_inner = true;
                     n_drop = 0;
                   }
-                else if (at == CTAT_ROW && a == PIVOT_AXIS_COLUMN && t->label_axis[PIVOT_AXIS_COLUMN] == PIVOT_AXIS_LAYER)
+                else if (at == CTAT_COL && a == PIVOT_AXIS_ROW && t->label_axis[PIVOT_AXIS_COLUMN] == PIVOT_AXIS_ROW)
+                  n_drop = 0;
+                else if (at == CTAT_COL && a == PIVOT_AXIS_ROW && t->label_axis[PIVOT_AXIS_ROW] == PIVOT_AXIS_LAYER)
                   {
                     drop_inner = true;
                     n_drop = 0;
                   }
+                else if (at == CTAT_LAYERROW)
+                  n_drop = a == PIVOT_AXIS_ROW && t->label_axis[PIVOT_AXIS_ROW] == PIVOT_AXIS_COLUMN;
+                else if (at == CTAT_LAYERCOL)
+                  n_drop = a == PIVOT_AXIS_COLUMN && t->label_axis[PIVOT_AXIS_COLUMN] == PIVOT_AXIS_ROW;
+                else if (at == CTAT_SUBTABLE)
+                  n_drop = a != PIVOT_AXIS_LAYER;
+                else if (at == CTAT_ROW)
+                  {
+                    n_drop = a == PIVOT_AXIS_COLUMN;
+                    if (a == PIVOT_AXIS_ROW && t->label_axis[PIVOT_AXIS_ROW] == PIVOT_AXIS_COLUMN)
+                      n_drop++;
+                  }
+                else if (at == CTAT_COL)
+                  {
+                    n_drop = a == PIVOT_AXIS_ROW;
+                    if (a == PIVOT_AXIS_COLUMN && t->label_axis[PIVOT_AXIS_COLUMN] == PIVOT_AXIS_ROW)
+                      n_drop++;
+                  }
                 else
                   {
                     n_drop = 0;
-                    if (at == CTAT_SUBTABLE ? a != PIVOT_AXIS_LAYER
-                        : at == CTAT_ROW ? a == PIVOT_AXIS_COLUMN
-                        : at == CTAT_COL ? a == PIVOT_AXIS_ROW
-                        : false)
-                      n_drop++;
-                    if ((t->label_axis[PIVOT_AXIS_ROW] == PIVOT_AXIS_COLUMN && (at == CTAT_ROW || at == CTAT_LAYERROW) && a == PIVOT_AXIS_ROW)
-                        || (t->label_axis[PIVOT_AXIS_COLUMN] == PIVOT_AXIS_ROW && (at == CTAT_COL || at == CTAT_LAYERCOL) && a == PIVOT_AXIS_COLUMN))
-                    n_drop++;
                   }
 
                 if (drop_inner)