X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fstats%2Fctables.c;h=16c58fdc5bf35cc0b4cef86c285d5eb405d8c0fe;hb=2501627caac743acbfcc97480f15344f8a393a6e;hp=cd963e785feb0b83ba8ea1a4e4e3f36b5e6c77d6;hpb=a58399ea2ce9421f72cc5771cd215b121bd8f9dd;p=pspp

diff --git a/src/language/stats/ctables.c b/src/language/stats/ctables.c
index cd963e785f..16c58fdc5b 100644
--- a/src/language/stats/ctables.c
+++ b/src/language/stats/ctables.c
@@ -4693,28 +4693,45 @@ 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)
+                if (at == CTAT_SUBTABLE)
                   {
-                    if (t->clabels_to_axis != PIVOT_AXIS_LAYER)
-                      n_drop = a == t->clabels_from_axis ? 2 : 0;
-                    else
+                    if (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
+                      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)
                   {
@@ -4728,21 +4745,15 @@ 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_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 ((at == CTAT_ROW && a == PIVOT_AXIS_ROW && t->label_axis[PIVOT_AXIS_ROW] == PIVOT_AXIS_COLUMN)
-                        || (at == CTAT_COL && a == PIVOT_AXIS_COLUMN && t->label_axis[PIVOT_AXIS_COLUMN] == PIVOT_AXIS_ROW))
-                      n_drop++;
                   }
 
                 if (drop_inner)