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

refactor
---

diff --git a/src/language/stats/ctables.c b/src/language/stats/ctables.c
index 57e547376a..8f8d6c885f 100644
--- a/src/language/stats/ctables.c
+++ b/src/language/stats/ctables.c
@@ -4691,6 +4691,18 @@ ctables_prepare_table (struct ctables_table *t)
                     continue;
                   }
 
+                enum pivot_axis_type ata, atb;
+                if (at == CTAT_ROW || at == CTAT_LAYERROW)
+                  {
+                    ata = PIVOT_AXIS_ROW;
+                    atb = PIVOT_AXIS_COLUMN;
+                  }
+                else if (at == CTAT_COL || at == CTAT_LAYERCOL)
+                  {
+                    ata = PIVOT_AXIS_COLUMN;
+                    atb = PIVOT_AXIS_ROW;
+                  }
+
                 size_t n_drop = 0;
                 bool drop_inner = false;
                 switch (at)
@@ -4702,17 +4714,14 @@ ctables_prepare_table (struct ctables_table *t)
                       n_drop = a == t->clabels_from_axis ? 2 : 0;
                     else
                       {
+                        n_drop = a != PIVOT_AXIS_LAYER && a != t->clabels_from_axis;
                         drop_inner = a == t->clabels_from_axis;
-                        n_drop = a != t->clabels_from_axis && a != PIVOT_AXIS_LAYER;
                       }
                     break;
 
                   case CTAT_LAYERROW:
-                    n_drop = a == PIVOT_AXIS_ROW && t->label_axis[PIVOT_AXIS_ROW] == PIVOT_AXIS_COLUMN;
-                    break;
-
                   case CTAT_LAYERCOL:
-                    n_drop = a == PIVOT_AXIS_COLUMN && t->label_axis[PIVOT_AXIS_COLUMN] == PIVOT_AXIS_ROW;
+                    n_drop = a == ata && t->label_axis[ata] == atb;
                     break;
 
                   case CTAT_ROW: