X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Flanguage%2Fdictionary%2Fformats.c;h=b2cc3a5c394d7f009750474f017c114fdae79393;hb=f4e3578b2c8ce537de5516af55a62b84ebf2b744;hp=718344acc63ed1037787c1ab6823507b7e2ae8dd;hpb=cac0d191514553fede1858bf3dceee9073e60c1a;p=pspp

diff --git a/src/language/dictionary/formats.c b/src/language/dictionary/formats.c
index 718344acc6..b2cc3a5c39 100644
--- a/src/language/dictionary/formats.c
+++ b/src/language/dictionary/formats.c
@@ -73,6 +73,8 @@ internal_cmd_formats (struct lexer *lexer, struct dataset *ds, int which)
       int width;
       size_t i;
 
+      lex_match (lexer, T_SLASH);
+
       if (lex_token (lexer) == T_ENDCMD)
 	break;
 
@@ -82,17 +84,17 @@ internal_cmd_formats (struct lexer *lexer, struct dataset *ds, int which)
 
       if (!lex_match (lexer, T_LPAREN))
 	{
-	  msg (SE, _("`(' expected after variable list."));
+          lex_error_expecting (lexer, "`('");
 	  goto fail;
 	}
       if (!parse_format_specifier (lexer, &f)
           || !fmt_check_output (&f)
-          || !fmt_check_width_compat (&f, width))
+          || !fmt_check_width_compat (&f, var_get_name (v[0]), width))
 	goto fail;
 
       if (!lex_match (lexer, T_RPAREN))
 	{
-	  msg (SE, _("`)' expected after output format."));
+          lex_error_expecting (lexer, "`)'");
 	  goto fail;
 	}