From: Ben Pfaff <blp@cs.stanford.edu>
Date: Sun, 14 Aug 2022 04:50:42 +0000 (-0700)
Subject: refactoring
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?p=pspp;a=commitdiff_plain;h=033449d465fb54526d3984d55772e6a38e7d922c

refactoring
---

diff --git a/src/language/stats/ctables.c b/src/language/stats/ctables.c
index fac05a9bc2..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--)
                       {