From: Ben Pfaff Date: Thu, 10 Nov 2022 15:35:01 +0000 (-0800) Subject: MATRIX DATA: Improve error messages. X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=55323b36ee5e375d03f39e1170372593e8f1a8e9;p=pspp MATRIX DATA: Improve error messages. --- diff --git a/src/language/data-io/matrix-data.c b/src/language/data-io/matrix-data.c index 83490d4db8..920bac9cc7 100644 --- a/src/language/data-io/matrix-data.c +++ b/src/language/data-io/matrix-data.c @@ -1002,7 +1002,9 @@ cmd_matrix_data (struct lexer *lexer, struct dataset *ds) mf.diagonal = NO_DIAGONAL; else { - lex_error (lexer, NULL); + lex_error_expecting (lexer, "LIST", "FREE", + "UPPER", "LOWER", "FULL", + "DIAGONAL", "NODIAGONAL"); goto error; } } @@ -1118,7 +1120,8 @@ cmd_matrix_data (struct lexer *lexer, struct dataset *ds) } else { - lex_error (lexer, NULL); + lex_error_expecting (lexer, "N", "FORMAT", "FILE", "SPLIT", "FACTORS", + "CELLS", "CONTENTS"); goto error; } } diff --git a/tests/language/data-io/matrix-data.at b/tests/language/data-io/matrix-data.at index da4653d749..8159d149c7 100644 --- a/tests/language/data-io/matrix-data.at +++ b/tests/language/data-io/matrix-data.at @@ -1251,7 +1251,7 @@ matrix-data.sps:12: error: MATRIX DATA: CELLS is required when factor variables 21 | MATRIX DATA VARIABLES=v/N=-1. | ^~" -"matrix-data.sps:22.32-22.36: error: MATRIX DATA: Syntax error. +"matrix-data.sps:22.32-22.36: error: MATRIX DATA: Syntax error expecting LIST, FREE, UPPER, LOWER, FULL, DIAGONAL, or NODIAGONAL. 22 | MATRIX DATA VARIABLES=v/FORMAT=XYZZY. | ^~~~~" @@ -1267,7 +1267,7 @@ matrix-data.sps:12: error: MATRIX DATA: CELLS is required when factor variables 25 | MATRIX DATA VARIABLES=v/CELLS=-1. | ^~" -"matrix-data.sps:26.25-26.29: error: MATRIX DATA: Syntax error. +"matrix-data.sps:26.25-26.29: error: MATRIX DATA: Syntax error expecting N, FORMAT, FILE, SPLIT, FACTORS, CELLS, or CONTENTS. 26 | MATRIX DATA VARIABLES=v/XYZZY. | ^~~~~" ])