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 b40f202cfa5febe7091d8b0329af970630ed8807..4b5a2b208ace70f69c896ba4c4bd65941196fa5d 100644
(file)
--- a/
src/language/dictionary/formats.c
+++ b/
src/language/dictionary/formats.c
@@
-20,8
+20,8
@@
#include <stdio.h>
#include <stdlib.h>
#include <stdio.h>
#include <stdlib.h>
+#include "data/dataset.h"
#include "data/format.h"
#include "data/format.h"
-#include "data/procedure.h"
#include "data/variable.h"
#include "language/command.h"
#include "language/lexer/format-parser.h"
#include "data/variable.h"
#include "language/command.h"
#include "language/lexer/format-parser.h"
@@
-67,37
+67,34
@@
internal_cmd_formats (struct lexer *lexer, struct dataset *ds, int which)
struct variable **v;
size_t cv;
struct variable **v;
size_t cv;
- /* Format to set the variables to. */
- struct fmt_spec f;
-
- /* Numeric or string. */
- int type;
-
- /* Counter. */
- size_t i;
-
for (;;)
{
for (;;)
{
+ struct fmt_spec f;
+ int width;
+ size_t i;
+
+ lex_match (lexer, T_SLASH);
+
if (lex_token (lexer) == T_ENDCMD)
break;
if (lex_token (lexer) == T_ENDCMD)
break;
- if (!parse_variables (lexer, dataset_dict (ds), &v, &cv, PV_
NUMERIC
))
+ if (!parse_variables (lexer, dataset_dict (ds), &v, &cv, PV_
SAME_WIDTH
))
return CMD_FAILURE;
return CMD_FAILURE;
-
type = var_get_type
(v[0]);
+
width = var_get_width
(v[0]);
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)
|| !fmt_check_output (&f)
goto fail;
}
if (!parse_format_specifier (lexer, &f)
|| !fmt_check_output (&f)
- || !fmt_check_
type_compat (&f, VAL_NUMERIC
))
+ || !fmt_check_
width_compat (&f, width
))
goto fail;
if (!lex_match (lexer, T_RPAREN))
{
goto fail;
if (!lex_match (lexer, T_RPAREN))
{
-
msg (SE, _("`)' expected after output format.")
);
+
lex_error_expecting (lexer, "`)'", NULL_SENTINEL
);
goto fail;
}
goto fail;
}