From 378eba60327c0e97a82579ecbe62badc9be04823 Mon Sep 17 00:00:00 2001 From: Ben Pfaff Date: Thu, 10 Nov 2022 22:15:18 -0800 Subject: [PATCH] CTABLES: Improve error messages. --- src/language/stats/ctables.c | 7 ++++--- tests/language/stats/ctables.at | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/language/stats/ctables.c b/src/language/stats/ctables.c index 5359c4cabd..05e9824b7d 100644 --- a/src/language/stats/ctables.c +++ b/src/language/stats/ctables.c @@ -890,7 +890,8 @@ ctables_pcexpr_parse_primary (struct lexer *lexer, struct dictionary *dict) } else { - lex_error (lexer, NULL); + lex_error (lexer, + _("Syntax error expecting number or string or range.")); return NULL; } @@ -920,7 +921,7 @@ ctables_pcexpr_parse_primary (struct lexer *lexer, struct dictionary *dict) } else { - lex_error (lexer, NULL); + lex_error (lexer, _("Syntax error in postcompute expression.")); return NULL; } @@ -1883,7 +1884,7 @@ ctables_table_parse_explicit_category (struct lexer *lexer, } else { - lex_error (lexer, NULL); + lex_error (lexer, _("Syntax error expecting category specification.")); return false; } diff --git a/tests/language/stats/ctables.at b/tests/language/stats/ctables.at index 7aca64e3a9..61db4e8126 100644 --- a/tests/language/stats/ctables.at +++ b/tests/language/stats/ctables.at @@ -833,11 +833,11 @@ ctables.sps:17.35: error: CTABLES: Syntax error expecting `/'. 17 | CTABLES /PCOMPUTE &x=EXPR(1**2**3). | ^ -ctables.sps:18.28-18.29: error: CTABLES: Syntax error. +ctables.sps:18.28-18.29: error: CTABLES: Syntax error expecting number or string or range. 18 | CTABLES /PCOMPUTE &x=EXPR([**]). | ^~ -ctables.sps:19.27-19.28: error: CTABLES: Syntax error. +ctables.sps:19.27-19.28: error: CTABLES: Syntax error in postcompute expression. 19 | CTABLES /PCOMPUTE &x=EXPR(**). | ^~ -- 2.30.2