Improve error messages for missing subcommands.

[pspp] / src / language / dictionary / numeric.c

diff --git a/src/language/dictionary/numeric.c b/src/language/dictionary/numeric.c
index 82b175725d27e2ff15070459bea9a899b0ae432d..ae9f25325a48ce0cded05b7451aa691633372d63 100644 (file)
--- a/src/language/dictionary/numeric.c
+++ b/src/language/dictionary/numeric.c
@@ -58,20 +58,21 @@ cmd_numeric (struct lexer *lexer, struct dataset *ds)
          if (!parse_format_specifier (lexer, &f))
            goto fail;
 
-         if ( ! fmt_check_output (&f))
+         if (! fmt_check_output (&f))
            goto fail;
 
          if (fmt_is_string (f.type))
            {
               char str[FMT_STRING_LEN_MAX + 1];
-             msg (SE, _("Format type %s may not be used with a numeric "
-                         "variable."), fmt_to_string (&f, str));
+             lex_next_error (lexer, -1, -1,
+                              _("Format type %s may not be used with a numeric "
+                                "variable."), fmt_to_string (&f, str));
              goto fail;
            }
 
          if (!lex_match (lexer, T_RPAREN))
            {
-              lex_error_expecting (lexer, "`)'", NULL_SENTINEL);
+              lex_error_expecting (lexer, "`)'");
              goto fail;
            }
        }
@@ -135,8 +136,9 @@ cmd_string (struct lexer *lexer, struct dataset *ds)
       if (!fmt_is_string (f.type))
        {
           char str[FMT_STRING_LEN_MAX + 1];
-         msg (SE, _("Format type %s may not be used with a string "
-                     "variable."), fmt_to_string (&f, str));
+         lex_next_error (lexer, -2, -2,
+                          _("Format type %s may not be used with a string "
+                            "variable."), fmt_to_string (&f, str));
          goto fail;
        }
       if (!fmt_check_output (&f))