X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fstats%2Fctables.c;h=01c16cc1e98a14f3315fbb433b8e726be61c1c2b;hb=f6c6ee97c412e47eb1c7c30adc224e93b6c1586a;hp=b5a9101b7bfb6bc58c3b1a27e65fc76acee959be;hpb=18cbae3479d770c1f517ee2ccc060c7457f2a0d7;p=pspp

diff --git a/src/language/stats/ctables.c b/src/language/stats/ctables.c
index b5a9101b7b..01c16cc1e9 100644
--- a/src/language/stats/ctables.c
+++ b/src/language/stats/ctables.c
@@ -4665,83 +4665,76 @@ ctables_prepare_table (struct ctables_table *t)
                 nest->areas[at] = xmalloc (nest->n * sizeof *nest->areas[at]);
                 nest->n_areas[at] = 0;
 
-                bool add_vars = (at == CTAT_LAYER ? a == PIVOT_AXIS_LAYER
-                                 : at == CTAT_LAYERROW ? a != PIVOT_AXIS_COLUMN
-                                 : at == CTAT_LAYERCOL ? a != PIVOT_AXIS_ROW
-                                 : at == CTAT_TABLE ? false
-                                 : true);
-                if (add_vars)
-                  for (size_t k = 0; k < nest->n; k++)
-                    {
-                      if (k == nest->scale_idx)
-                        continue;
-                      nest->areas[at][nest->n_areas[at]++] = k;
-                    }
-                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))
+                enum pivot_axis_type ata, atb;
+                if (at == CTAT_ROW || at == CTAT_LAYERROW)
                   {
-                    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;
+                    ata = PIVOT_AXIS_ROW;
+                    atb = PIVOT_AXIS_COLUMN;
                   }
-
-                size_t n_drop;
-                bool drop_inner = false;
-                if (at == CTAT_SUBTABLE
-                    && t->clabels_from_axis != PIVOT_AXIS_LAYER)
+                else if (at == CTAT_COL || at == CTAT_LAYERCOL)
                   {
-                    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;
-                      }
+                    ata = PIVOT_AXIS_COLUMN;
+                    atb = PIVOT_AXIS_ROW;
                   }
-                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)
+
+                if (at == CTAT_LAYER
+                    ? a != PIVOT_AXIS_LAYER && t->label_axis[a] == PIVOT_AXIS_LAYER
+                    : at == CTAT_LAYERCOL || at == CTAT_LAYERROW
+                    ? a == atb && t->label_axis[a] != a
+                    : false)
                   {
-                    drop_inner = true;
-                    n_drop = 0;
+                    for (size_t k = nest->n - 1; k < nest->n; k--)
+                      if (k != nest->scale_idx)
+                        {
+                          nest->areas[at][nest->n_areas[at]++] = k;
+                          break;
+                        }
+                    continue;
                   }
-                else
+
+                if (at == CTAT_LAYER ? a != PIVOT_AXIS_LAYER
+                    : at == CTAT_LAYERROW || at == CTAT_LAYERCOL ? a == atb
+                    : at == CTAT_TABLE ? true
+                    : false)
+                  continue;
+
+                for (size_t k = 0; k < nest->n; k++)
+                  if (k != nest->scale_idx)
+                    nest->areas[at][nest->n_areas[at]++] = k;
+
+                int n_drop;
+                switch (at)
                   {
+                  case CTAT_SUBTABLE:
+#define L PIVOT_AXIS_LAYER
+                    n_drop = (t->clabels_from_axis == L ? a != L
+                              : t->clabels_to_axis == L ? (a == t->clabels_from_axis ? -1 : a != L)
+                              : a == t->clabels_from_axis ? 2
+                              : 0);
+#undef L
+                    break;
+
+                  case CTAT_LAYERROW:
+                  case CTAT_LAYERCOL:
+                    n_drop = a == ata && t->label_axis[ata] == atb;
+                    break;
+
+                  case CTAT_ROW:
+                  case CTAT_COL:
+                    n_drop = (a == ata ? t->label_axis[ata] == atb
+                              : a != atb ? 0
+                              : t->clabels_from_axis == atb ? -1
+                              : t->clabels_to_axis != atb ? 1
+                              : 0);
+                    break;
+
+                  case CTAT_LAYER:
+                  case CTAT_TABLE:
                     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 || at == CTAT_LAYERROW) && t->label_axis[PIVOT_AXIS_ROW] == PIVOT_AXIS_COLUMN && a == PIVOT_AXIS_ROW)
-                        || ((at == CTAT_COL || at == CTAT_LAYERCOL) && t->label_axis[PIVOT_AXIS_COLUMN] == PIVOT_AXIS_ROW && a == PIVOT_AXIS_COLUMN))
-                      n_drop++;
+                    break;
                   }
 
-                if (drop_inner)
+                if (n_drop < 0)
                   {
                     size_t n = nest->n_areas[at];
                     if (n > 1)
@@ -4750,9 +4743,12 @@ ctables_prepare_table (struct ctables_table *t)
                         nest->n_areas[at]--;
                       }
                   }
-                for (size_t i = 0; i < n_drop; i++)
-                  if (nest->n_areas[at] > 0)
-                    nest->n_areas[at]--;
+                else
+                  {
+                    for (int i = 0; i < n_drop; i++)
+                      if (nest->n_areas[at] > 0)
+                        nest->n_areas[at]--;
+                  }
               }
           }
       }