X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fstats%2Fctables.c;h=20f18916c85ba619976d227d222eaa27179b3676;hb=033449d465fb54526d3984d55772e6a38e7d922c;hp=2a970ed19a47b203a78e7cedec7e610f943419aa;hpb=09d9d1ef8bfb8113e8472405ee46f4dfff838f32;p=pspp

diff --git a/src/language/stats/ctables.c b/src/language/stats/ctables.c
index 2a970ed19a..20f18916c8 100644
--- a/src/language/stats/ctables.c
+++ b/src/language/stats/ctables.c
@@ -4678,17 +4678,9 @@ ctables_prepare_table (struct ctables_table *t)
                         continue;
                       nest->areas[at][nest->n_areas[at]++] = k;
                     }
-                else if (at == CTAT_LAYERCOL && a == PIVOT_AXIS_ROW && t->label_axis[PIVOT_AXIS_ROW] == PIVOT_AXIS_COLUMN)
-                  {
-                    for (size_t k = nest->n - 1; k < nest->n; k--)
-                      {
-                        if (k == nest->scale_idx)
-                          continue;
-                        nest->areas[at][nest->n_areas[at]++] = k;
-                        break;
-                      }
-                  }
-                else if (at == CTAT_LAYERROW && a == PIVOT_AXIS_COLUMN && t->label_axis[PIVOT_AXIS_COLUMN] == PIVOT_AXIS_ROW)
+                else if ((at == CTAT_LAYERCOL && a == PIVOT_AXIS_ROW && t->label_axis[a] != a)
+                         || (at == CTAT_LAYERROW && a == PIVOT_AXIS_COLUMN && t->label_axis[a] != a)
+                         || (at == CTAT_LAYER && t->label_axis[a] == PIVOT_AXIS_LAYER))
                   {
                     for (size_t k = nest->n - 1; k < nest->n; k--)
                       {
@@ -4697,30 +4689,60 @@ ctables_prepare_table (struct ctables_table *t)
                         nest->areas[at][nest->n_areas[at]++] = k;
                         break;
                       }
+                    continue;
                   }
 
+                size_t n_drop;
                 if (at == CTAT_SUBTABLE && t->label_axis[PIVOT_AXIS_ROW] == PIVOT_AXIS_COLUMN)
                   {
-                    size_t n_drop = (a == PIVOT_AXIS_LAYER ? 0
-                                     : a == PIVOT_AXIS_ROW ? 2
-                                     : 0);
-                    for (size_t i = 0; i < n_drop; i++)
-                      if (nest->n_areas[at] > 0)
-                        nest->n_areas[at]--;
-                    continue;
+                    n_drop = (a == PIVOT_AXIS_LAYER ? 0
+                              : a == PIVOT_AXIS_ROW ? 2
+                              : 0);
                   }
                 else if (at == CTAT_SUBTABLE && t->label_axis[PIVOT_AXIS_COLUMN] == PIVOT_AXIS_ROW)
                   {
-                    size_t n_drop = (a == PIVOT_AXIS_LAYER ? 0
-                                     : a == PIVOT_AXIS_COLUMN ? 2
-                                     : 0);
-                    for (size_t i = 0; i < n_drop; i++)
-                      if (nest->n_areas[at] > 0)
-                        nest->n_areas[at]--;
-                    continue;
+                    n_drop = (a == PIVOT_AXIS_LAYER ? 0
+                              : a == PIVOT_AXIS_COLUMN ? 2
+                              : 0);
+                  }
+                else if (at == CTAT_SUBTABLE && t->label_axis[PIVOT_AXIS_ROW] == PIVOT_AXIS_LAYER)
+                  {
+                    if (a == PIVOT_AXIS_COLUMN)
+                      n_drop = 1;
+                    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 = 0;
+                      }
+                  }
+                else if (at == CTAT_SUBTABLE && t->label_axis[PIVOT_AXIS_COLUMN] == PIVOT_AXIS_LAYER)
+                  {
+                    if (a == PIVOT_AXIS_ROW)
+                      n_drop = 1;
+                    else
+                      {
+                        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]--;
+                              }
+                          }
+                        n_drop = 0;
+                      }
                   }
                 else if (at == CTAT_ROW && a == PIVOT_AXIS_COLUMN && t->label_axis[PIVOT_AXIS_ROW] == PIVOT_AXIS_COLUMN)
-                  continue;
+                  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];
@@ -4729,7 +4751,7 @@ ctables_prepare_table (struct ctables_table *t)
                         nest->areas[at][n - 2] = nest->areas[at][n - 1];
                         nest->n_areas[at]--;
                       }
-                    continue;
+                    n_drop = 0;
                   }
                 else if (at == CTAT_COL && a == PIVOT_AXIS_ROW && t->label_axis[PIVOT_AXIS_COLUMN] == PIVOT_AXIS_ROW)
                   continue;
@@ -4741,21 +4763,48 @@ ctables_prepare_table (struct ctables_table *t)
                         nest->areas[at][n - 2] = nest->areas[at][n - 1];
                         nest->n_areas[at]--;
                       }
-                    continue;
+                    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)
+                      {
+                        nest->areas[at][n - 2] = nest->areas[at][n - 1];
+                        nest->n_areas[at]--;
+                      }
+                    n_drop = 0;
+                  }
+                else if (at == CTAT_ROW && a == PIVOT_AXIS_COLUMN && t->label_axis[PIVOT_AXIS_COLUMN] == PIVOT_AXIS_LAYER)
+                  {
+                    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 = 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++;
                   }
 
-                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);
-                if (drop_last && nest->n_areas[at] > 0)
-                  nest->n_areas[at]--;
-
-                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));
-                if (drop_additional && nest->n_areas[at] > 0)
-                  nest->n_areas[at]--;
+                for (size_t i = 0; i < n_drop; i++)
+                  if (nest->n_areas[at] > 0)
+                    nest->n_areas[at]--;
               }
           }
       }