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

refactoring
---

diff --git a/src/language/stats/ctables.c b/src/language/stats/ctables.c
index ff8f1abbc0..b5a9101b7b 100644
--- a/src/language/stats/ctables.c
+++ b/src/language/stats/ctables.c
@@ -4694,15 +4694,15 @@ ctables_prepare_table (struct ctables_table *t)
                 size_t n_drop;
                 bool drop_inner = false;
                 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->clabels_from_axis != PIVOT_AXIS_LAYER
-                         && t->clabels_to_axis == PIVOT_AXIS_LAYER)
+                    && t->clabels_from_axis != PIVOT_AXIS_LAYER)
                   {
-                    drop_inner = a == t->clabels_from_axis;
-                    n_drop = a != t->clabels_from_axis && a != PIVOT_AXIS_LAYER;
+                    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;
+                      }
                   }
                 else if (at == CTAT_ROW && a == PIVOT_AXIS_COLUMN && t->label_axis[PIVOT_AXIS_ROW] == PIVOT_AXIS_COLUMN)
                   n_drop = 0;
@@ -4736,9 +4736,9 @@ ctables_prepare_table (struct ctables_table *t)
                         : at == CTAT_COL ? a == PIVOT_AXIS_ROW
                         : false)
                       n_drop++;
-                    if ((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++;
+                    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++;
                   }
 
                 if (drop_inner)