MATRIX DATA: Improve error messages.

[pspp] / src / language / data-io / matrix-data.c

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;
        }
     }