refactor

diff --git a/src/language/stats/ctables.c b/src/language/stats/ctables.c
index 813bec9891482959018887cfadf571e14f875512..16c58fdc5bf35cc0b4cef86c285d5eb405d8c0fe 100644 (file)
--- a/src/language/stats/ctables.c
+++ b/src/language/stats/ctables.c
@@ -4708,17 +4708,30 @@ ctables_prepare_table (struct ctables_table *t)
                     else
                       n_drop = 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_ROW && a == PIVOT_AXIS_COLUMN && t->label_axis[PIVOT_AXIS_COLUMN] == PIVOT_AXIS_ROW)
-                  {
-                    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_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_ROW)
                   {
-                    drop_inner = true;
-                    n_drop = 0;
+                    if (a == PIVOT_AXIS_COLUMN && t->label_axis[PIVOT_AXIS_ROW] == PIVOT_AXIS_COLUMN)
+                      n_drop = 0;
+                    else if (a == PIVOT_AXIS_COLUMN && t->label_axis[PIVOT_AXIS_COLUMN] == PIVOT_AXIS_ROW)
+                      {
+                        drop_inner = true;
+                        n_drop = 0;
+                      }
+                    else if (a == PIVOT_AXIS_COLUMN && t->label_axis[PIVOT_AXIS_COLUMN] == PIVOT_AXIS_LAYER)
+                      {
+                        drop_inner = true;
+                        n_drop = 0;
+                      }
+                    else
+                      {
+                        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 && a == PIVOT_AXIS_ROW && t->label_axis[PIVOT_AXIS_ROW] == PIVOT_AXIS_COLUMN)
                   {
@@ -4732,16 +4745,6 @@ ctables_prepare_table (struct ctables_table *t)
                     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_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;