/* PSPP - a program for statistical analysis.
- Copyright (C) 1997-9, 2000, 2006, 2010, 2011 Free Software Foundation, Inc.
+ Copyright (C) 1997-9, 2000, 2006, 2010, 2011, 2014 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
#include <stdlib.h>
+#include "data/dataset.h"
#include "data/dictionary.h"
-#include "data/procedure.h"
#include "data/variable.h"
#include "data/format.h"
#include "language/command.h"
do
{
- /* Format spec for variables to create. f.type==-1 if default is to
- be used. */
+ /* Format spec for variables to create. */
struct fmt_spec f;
if (!parse_DATA_LIST_vars (lexer, dataset_dict (ds),
if (!parse_format_specifier (lexer, &f))
goto fail;
- if ( ! fmt_check_output (&f))
- goto fail;
+ char *error = fmt_check_output__ (&f);
+ if (error)
+ {
+ lex_next_error (lexer, -1, -1, "%s", error);
+ free (error);
+ 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))
{
- msg (SE, _("`)' expected after output format."));
+ lex_error_expecting (lexer, "`)'");
goto fail;
}
}
else
- f.type = -1;
+ f = var_default_formats (0);
/* Create each variable. */
for (i = 0; i < nv; i++)
if (!new_var)
msg (SE, _("There is already a variable named %s."), v[i]);
else
- {
- if (f.type != -1)
- var_set_both_formats (new_var, &f);
- }
+ var_set_both_formats (new_var, &f);
}
/* Clean up. */
return CMD_FAILURE;
if (!lex_force_match (lexer, T_LPAREN)
- || !parse_format_specifier (lexer, &f)
- || !lex_force_match (lexer, T_RPAREN))
+ || !parse_format_specifier (lexer, &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 string "
- "variable."), fmt_to_string (&f, str));
- goto fail;
- }
- if (!fmt_check_output (&f))
+
+ char *error = fmt_check_type_compat__ (&f, NULL, VAL_STRING);
+ if (!error)
+ error = fmt_check_output__ (&f);
+ if (error)
+ {
+ lex_next_error (lexer, -2, -2, "%s", error);
+ free (error);
+ goto fail;
+ }
+
+ if (!lex_force_match (lexer, T_RPAREN))
goto fail;
width = fmt_var_width (&f);