X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fstats%2Fctables.c;h=aeae6223fc45db75643f608772fc39b3a4392db0;hb=2ad9fc0f13133346ba6b153bf38a2fc06bf0be51;hp=7f5ac97f8bb9de9b0f2aac8a059aec589c4e481c;hpb=3221f4af1d83871f3f5d97fcb836a34b2dd81e66;p=pspp

diff --git a/src/language/stats/ctables.c b/src/language/stats/ctables.c
index 7f5ac97f8b..aeae6223fc 100644
--- a/src/language/stats/ctables.c
+++ b/src/language/stats/ctables.c
@@ -4691,69 +4691,60 @@ ctables_prepare_table (struct ctables_table *t)
                     continue;
                   }
 
-                size_t n_drop;
+                enum pivot_axis_type ata, atb;
+                if (at == CTAT_ROW || at == CTAT_LAYERROW)
+                  {
+                    ata = PIVOT_AXIS_ROW;
+                    atb = PIVOT_AXIS_COLUMN;
+                  }
+                else if (at == CTAT_COL || at == CTAT_LAYERCOL)
+                  {
+                    ata = PIVOT_AXIS_COLUMN;
+                    atb = PIVOT_AXIS_ROW;
+                  }
+
+                size_t n_drop = 0;
                 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->label_axis[PIVOT_AXIS_ROW] == PIVOT_AXIS_LAYER)
+                switch (at)
                   {
-                    if (a == PIVOT_AXIS_COLUMN)
-                      n_drop = 1;
+                  case CTAT_SUBTABLE:
+                    if (t->clabels_from_axis == PIVOT_AXIS_LAYER)
+                      n_drop = a != PIVOT_AXIS_LAYER;
+                    else if (t->clabels_to_axis != PIVOT_AXIS_LAYER)
+                      n_drop = a == t->clabels_from_axis ? 2 : 0;
                     else
                       {
-                        if (a == PIVOT_AXIS_ROW)
-                          drop_inner = true;
-                        n_drop = 0;
+                        n_drop = a != PIVOT_AXIS_LAYER && a != t->clabels_from_axis;
+                        drop_inner = a == t->clabels_from_axis;
                       }
-                  }
-                else if (at == CTAT_SUBTABLE && t->label_axis[PIVOT_AXIS_COLUMN] == PIVOT_AXIS_LAYER)
-                  {
-                    if (a == PIVOT_AXIS_ROW)
-                      n_drop = 1;
-                    else
+                    break;
+
+                  case CTAT_LAYERROW:
+                  case CTAT_LAYERCOL:
+                    n_drop = a == ata && t->label_axis[ata] == atb;
+                    break;
+
+                  case CTAT_ROW:
+                  case CTAT_COL:
+                    if (a == atb)
                       {
-                        if (a == PIVOT_AXIS_COLUMN)
+                        if (t->label_axis[ata] == atb)
+                          ;
+                        else if (t->label_axis[atb] == ata)
+                          drop_inner = true;
+                        else if (t->label_axis[atb] == PIVOT_AXIS_LAYER)
                           drop_inner = true;
-                        n_drop = 0;
+                        else
+                          n_drop = 1;
                       }
-                  }
-                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)
-                  {
-                    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)
-                  {
-                    drop_inner = true;
-                    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_ROW && a == PIVOT_AXIS_COLUMN && t->label_axis[PIVOT_AXIS_COLUMN] == PIVOT_AXIS_LAYER)
-                  {
-                    drop_inner = true;
-                    n_drop = 0;
-                  }
-                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)
+                    if (a == ata && t->label_axis[ata] == atb)
                       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++;
+                    break;
+
+                  case CTAT_LAYER:
+                  case CTAT_TABLE:
+                    n_drop = 0;
+                    break;
                   }
 
                 if (drop_inner)