MATRIX DATA: Improve error messages.

diff --git a/src/language/data-io/matrix-data.c b/src/language/data-io/matrix-data.c
index 83490d4db824fe67756d7c1fc824971bcb815003..920bac9cc7d563aab6a7ab16496b50ecdd1bacf2 100644 (file)
--- 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 da4653d7492b6369e9f1151d2dc93ad3703765a4..8159d149c77e1d2328aa558290a915d5ef41589c 100644 (file)
--- 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.
       |                         ^~~~~"
 ])