From a4f9af015786499fdbf591e94c1728ba162b5f28 Mon Sep 17 00:00:00 2001 From: Ben Pfaff Date: Mon, 27 Dec 2021 21:03:13 -0800 Subject: [PATCH] more work --- src/language/stats/ctables.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/language/stats/ctables.c b/src/language/stats/ctables.c index 1b8ba198f8..624331ba5d 100644 --- a/src/language/stats/ctables.c +++ b/src/language/stats/ctables.c @@ -216,12 +216,7 @@ struct ctables_postcompute_expr /* CTPO_CAT_RANGE. XXX what about string ranges? */ - struct - { - double low; /* -DBL_MAX for LO. */ - double high; /* DBL_MAX for HIGH. */ - } - range; + double range[2]; /* CTPO_ADD, CTPO_SUB, CTPO_MUL, CTPO_DIV, CTPO_POW. */ struct ctables_postcompute_expr *subs[2]; @@ -1526,7 +1521,6 @@ cmd_ctables (struct lexer *lexer, struct dataset *ds) if (!lex_force_match (lexer, T_SLASH)) break; - /* XXX Validate axes. */ while (!lex_match_id (lexer, "TABLE") && lex_token (lexer) != T_ENDCMD) { if (lex_match_id (lexer, "SLABELS")) @@ -1857,6 +1851,13 @@ cmd_ctables (struct lexer *lexer, struct dataset *ds) goto error; } } + + if (t->row_labels != CTLP_NORMAL && t->col_labels != CTLP_NORMAL) + { + msg (SE, _("ROWLABELS and COLLABELS may not both be specified.")); + goto error; + } + } while (lex_token (lexer) != T_ENDCMD); ctables_destroy (ct); -- 2.30.2