X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fstats%2Fctables.c;h=8f8d6c885f4d0ee5b3991d3d0a2833abc175ba16;hb=4d777aeacfa602840718862c31c9059e3d289eed;hp=fc58d4b704b1029cdf3687c0909c4e711aeb38a7;hpb=e378d75c125c92e895ae7c112774586cd1d3eda3;p=pspp

diff --git a/src/language/stats/ctables.c b/src/language/stats/ctables.c
index fc58d4b704..8f8d6c885f 100644
--- a/src/language/stats/ctables.c
+++ b/src/language/stats/ctables.c
@@ -4691,82 +4691,88 @@ ctables_prepare_table (struct ctables_table *t)
                     continue;
                   }
 
-                size_t n_drop;
-                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)
+                enum pivot_axis_type ata, atb;
+                if (at == CTAT_ROW || at == CTAT_LAYERROW)
                   {
-                    if (a == PIVOT_AXIS_COLUMN)
-                      n_drop = 1;
+                    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;
+                switch (at)
+                  {
+                  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)
-                          {
-                            size_t n = nest->n_areas[at];
-                            if (n > 1)
-                              {
-                                nest->areas[at][n - 2] = nest->areas[at][n - 1];
-                                nest->n_areas[at]--;
-                              }
-                          }
+                        n_drop = a != PIVOT_AXIS_LAYER && a != t->clabels_from_axis;
+                        drop_inner = a == t->clabels_from_axis;
+                      }
+                    break;
+
+                  case CTAT_LAYERROW:
+                  case CTAT_LAYERCOL:
+                    n_drop = a == ata && t->label_axis[ata] == atb;
+                    break;
+
+                  case CTAT_ROW:
+                    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 (at == CTAT_SUBTABLE && t->label_axis[PIVOT_AXIS_COLUMN] == PIVOT_AXIS_LAYER)
-                  {
-                    if (a == PIVOT_AXIS_ROW)
-                      n_drop = 1;
-                    else
+                    else if (a == PIVOT_AXIS_COLUMN && t->label_axis[PIVOT_AXIS_COLUMN] == PIVOT_AXIS_LAYER)
                       {
-                        if (a == PIVOT_AXIS_COLUMN)
-                          {
-                            size_t n = nest->n_areas[at];
-                            if (n > 1)
-                              {
-                                nest->areas[at][n - 2] = nest->areas[at][n - 1];
-                                nest->n_areas[at]--;
-                              }
-                          }
+                        drop_inner = true;
                         n_drop = 0;
                       }
-                  }
-                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)
-                  {
-                    size_t n = nest->n_areas[at];
-                    if (n > 1)
+                    else
                       {
-                        nest->areas[at][n - 2] = nest->areas[at][n - 1];
-                        nest->n_areas[at]--;
+                        n_drop = a == PIVOT_AXIS_COLUMN;
+                        if (a == PIVOT_AXIS_ROW && t->label_axis[PIVOT_AXIS_ROW] == PIVOT_AXIS_COLUMN)
+                          n_drop++;
                       }
-                    n_drop = 0;
-                  }
-                else if (at == CTAT_COL && a == PIVOT_AXIS_ROW && t->label_axis[PIVOT_AXIS_COLUMN] == PIVOT_AXIS_ROW)
-                  continue;
-                else if (at == CTAT_ROW && a == PIVOT_AXIS_COLUMN && t->label_axis[PIVOT_AXIS_COLUMN] == PIVOT_AXIS_ROW)
-                  {
-                    size_t n = nest->n_areas[at];
-                    if (n > 1)
+                    break;
+
+                  case CTAT_COL:
+                    if (a == PIVOT_AXIS_ROW && t->label_axis[PIVOT_AXIS_ROW] == PIVOT_AXIS_COLUMN)
                       {
-                        nest->areas[at][n - 2] = nest->areas[at][n - 1];
-                        nest->n_areas[at]--;
+                        drop_inner = true;
+                        n_drop = 0;
                       }
-                    n_drop = 0;
-                  }
-                else if (at == CTAT_COL && a == PIVOT_AXIS_ROW && t->label_axis[PIVOT_AXIS_ROW] == PIVOT_AXIS_LAYER)
-                  {
-                    size_t n = nest->n_areas[at];
-                    if (n > 1)
+                    else if (a == PIVOT_AXIS_ROW && t->label_axis[PIVOT_AXIS_COLUMN] == PIVOT_AXIS_ROW)
+                      n_drop = 0;
+                    else if (a == PIVOT_AXIS_ROW && t->label_axis[PIVOT_AXIS_ROW] == PIVOT_AXIS_LAYER)
                       {
-                        nest->areas[at][n - 2] = nest->areas[at][n - 1];
-                        nest->n_areas[at]--;
+                        drop_inner = true;
+                        n_drop = 0;
+                      }
+                    else
+                      {
+                        n_drop = a == PIVOT_AXIS_ROW;
+                        if (a == PIVOT_AXIS_COLUMN && t->label_axis[PIVOT_AXIS_COLUMN] == PIVOT_AXIS_ROW)
+                          n_drop++;
                       }
+                    break;
+
+                  case CTAT_LAYER:
+                  case CTAT_TABLE:
                     n_drop = 0;
+                    break;
                   }
-                else if (at == CTAT_ROW && a == PIVOT_AXIS_COLUMN && t->label_axis[PIVOT_AXIS_COLUMN] == PIVOT_AXIS_LAYER)
+
+                if (drop_inner)
                   {
                     size_t n = nest->n_areas[at];
                     if (n > 1)
@@ -4774,25 +4780,7 @@ ctables_prepare_table (struct ctables_table *t)
                         nest->areas[at][n - 2] = nest->areas[at][n - 1];
                         nest->n_areas[at]--;
                       }
-                    n_drop = 0;
-                  }
-                else
-                  {
-                    bool drop_last = (at == CTAT_SUBTABLE ? a != PIVOT_AXIS_LAYER
-                                      : at == CTAT_ROW ? a == PIVOT_AXIS_COLUMN
-                                      : at == CTAT_COL ? a == PIVOT_AXIS_ROW
-                                      : false);
-                    bool drop_additional
-                      = ((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 = 0;
-                    if (drop_last)
-                      n_drop++;
-                    if (drop_additional)
-                      n_drop++;
                   }
-
                 for (size_t i = 0; i < n_drop; i++)
                   if (nest->n_areas[at] > 0)
                     nest->n_areas[at]--;