X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fstats%2Fctables.c;h=6d3f44d327d10410898127ef171c497c52d6cbce;hb=ea34fc3d157ce3038ea8cfe8c5e0ca21944762a7;hp=6c8812a1a4bc2c3506d097de63eae0416ad9841a;hpb=a3a6f7e27b704d74d8263638057403d9a89196f8;p=pspp

diff --git a/src/language/stats/ctables.c b/src/language/stats/ctables.c
index 6c8812a1a4..6d3f44d327 100644
--- a/src/language/stats/ctables.c
+++ b/src/language/stats/ctables.c
@@ -4728,18 +4728,28 @@ ctables_prepare_table (struct ctables_table *t)
                     drop_inner = true;
                     n_drop = 0;
                   }
-                else
+                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 = 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 = a == PIVOT_AXIS_COLUMN;
+                    if (a == PIVOT_AXIS_ROW && t->label_axis[PIVOT_AXIS_ROW] == PIVOT_AXIS_COLUMN)
                       n_drop++;
-                    if (((at == CTAT_ROW || at == CTAT_LAYERROW) && t->label_axis[PIVOT_AXIS_ROW] == PIVOT_AXIS_COLUMN && a == PIVOT_AXIS_ROW)
-                        || ((at == CTAT_COL || at == CTAT_LAYERCOL) && t->label_axis[PIVOT_AXIS_COLUMN] == PIVOT_AXIS_ROW && a == PIVOT_AXIS_COLUMN))
+                  }
+                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 (drop_inner)
                   {