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=2b9e010bbe4a749d8a3b47aa9cd4ded1b3d4a1f4;hpb=c0a1222e44261bf5c75707d6203a26a0da93ead3;p=pspp

diff --git a/src/language/stats/ctables.c b/src/language/stats/ctables.c
index 2b9e010bbe..20f18916c8 100644
--- a/src/language/stats/ctables.c
+++ b/src/language/stats/ctables.c
@@ -4678,29 +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[a] != a)
-                  {
-                    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;
-                      }
-                    continue;
-                  }
-                else if (at == CTAT_LAYERROW && a == PIVOT_AXIS_COLUMN && t->label_axis[a] != a)
-                  {
-                    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;
-                      }
-                    continue;
-                  }
-                else if (at == CTAT_LAYER && t->label_axis[a] == PIVOT_AXIS_LAYER)
+                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--)
                       {
@@ -4740,7 +4720,7 @@ ctables_prepare_table (struct ctables_table *t)
                                 nest->n_areas[at]--;
                               }
                           }
-                        continue;
+                        n_drop = 0;
                       }
                   }
                 else if (at == CTAT_SUBTABLE && t->label_axis[PIVOT_AXIS_COLUMN] == PIVOT_AXIS_LAYER)
@@ -4758,11 +4738,11 @@ ctables_prepare_table (struct ctables_table *t)
                                 nest->n_areas[at]--;
                               }
                           }
-                        continue;
+                        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];
@@ -4771,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;
@@ -4783,7 +4763,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_ROW] == PIVOT_AXIS_LAYER)
                   {
@@ -4793,7 +4773,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_ROW && a == PIVOT_AXIS_COLUMN && t->label_axis[PIVOT_AXIS_COLUMN] == PIVOT_AXIS_LAYER)
                   {
@@ -4803,7 +4783,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
                   {