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

refactor
---

diff --git a/src/language/stats/ctables.c b/src/language/stats/ctables.c
index 6d3f44d327..813bec9891 100644
--- a/src/language/stats/ctables.c
+++ b/src/language/stats/ctables.c
@@ -4693,16 +4693,20 @@ 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)
+                if (at == CTAT_SUBTABLE)
                   {
-                    if (t->clabels_to_axis != PIVOT_AXIS_LAYER)
-                      n_drop = a == t->clabels_from_axis ? 2 : 0;
-                    else
+                    if (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
+                      n_drop = 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;
@@ -4732,8 +4736,6 @@ ctables_prepare_table (struct ctables_table *t)
                   n_drop = a == PIVOT_AXIS_ROW && t->label_axis[PIVOT_AXIS_ROW] == PIVOT_AXIS_COLUMN;
                 else if (at == CTAT_LAYERCOL)
                   n_drop = a == PIVOT_AXIS_COLUMN && t->label_axis[PIVOT_AXIS_COLUMN] == PIVOT_AXIS_ROW;
-                else if (at == CTAT_SUBTABLE)
-                  n_drop = a != PIVOT_AXIS_LAYER;
                 else if (at == CTAT_ROW)
                   {
                     n_drop = a == PIVOT_AXIS_COLUMN;