From: Ben Pfaff <blp@cs.stanford.edu>
Date: Thu, 30 Dec 2021 23:14:15 +0000 (-0800)
Subject: all but last category
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?p=pspp;a=commitdiff_plain;h=80938eea690eaded701078c65f1fdae956c76233

all but last category
---

diff --git a/src/language/stats/ctables.c b/src/language/stats/ctables.c
index d3ab1a290a..96d12e03fc 100644
--- a/src/language/stats/ctables.c
+++ b/src/language/stats/ctables.c
@@ -1526,9 +1526,15 @@ ctables_execute (struct dataset *ds, struct ctables *ct)
                     break;
 
               for (size_t m = n_common; m + 1 < ft->vars.n; m++)
-                groups[m] = pivot_category_create_group__ (
-                  m > 0 ? groups[m - 1] : d->root,
-                  pivot_value_new_var_value (ft->vars.vars[m], &f->values[m]));
+                {
+                  struct pivot_category *parent = m > 0 ? groups[m - 1] : d->root;
+                  if (true)
+                    parent = pivot_category_create_group__ (
+                      parent, pivot_value_new_variable (ft->vars.vars[m]));
+                  groups[m] = pivot_category_create_group__ (
+                    parent,
+                    pivot_value_new_var_value (ft->vars.vars[m], &f->values[m]));
+                }
 
               int leaf = pivot_category_create_leaf (
                 ft->vars.n > 1 ? groups[ft->vars.n - 2] : d->root,