projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Suppress GCC 4.7 warnings by changes to code that make it less clear.
[pspp]
/
src
/
language
/
dictionary
/
formats.c
diff --git
a/src/language/dictionary/formats.c
b/src/language/dictionary/formats.c
index 718344acc63ed1037787c1ab6823507b7e2ae8dd..4b5a2b208ace70f69c896ba4c4bd65941196fa5d 100644
(file)
--- 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;
int width;
size_t i;
+ lex_match (lexer, T_SLASH);
+
if (lex_token (lexer) == T_ENDCMD)
break;
if (lex_token (lexer) == T_ENDCMD)
break;
@@
-82,7
+84,7
@@
internal_cmd_formats (struct lexer *lexer, struct dataset *ds, int which)
if (!lex_match (lexer, T_LPAREN))
{
if (!lex_match (lexer, T_LPAREN))
{
-
msg (SE, _("`(' expected after variable list.")
);
+
lex_error_expecting (lexer, "`('", NULL_SENTINEL
);
goto fail;
}
if (!parse_format_specifier (lexer, &f)
goto fail;
}
if (!parse_format_specifier (lexer, &f)
@@
-92,7
+94,7
@@
internal_cmd_formats (struct lexer *lexer, struct dataset *ds, int which)
if (!lex_match (lexer, T_RPAREN))
{
if (!lex_match (lexer, T_RPAREN))
{
-
msg (SE, _("`)' expected after output format.")
);
+
lex_error_expecting (lexer, "`)'", NULL_SENTINEL
);
goto fail;
}
goto fail;
}