/* 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, &v, &nv, PV_NO_DUPLICATE))
+ if (!parse_DATA_LIST_vars (lexer, dataset_dict (ds),
+ &v, &nv, PV_NO_DUPLICATE))
return CMD_FAILURE;
/* Get the optional format specification. */
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. */
}
while (lex_match (lexer, T_SLASH));
- return lex_end_of_command (lexer);
+ return CMD_SUCCESS;
/* If we have an error at a point where cleanup is required,
flow-of-control comes here. */
do
{
- if (!parse_DATA_LIST_vars (lexer, &v, &nv, PV_NO_DUPLICATE))
+ if (!parse_DATA_LIST_vars (lexer, dataset_dict (ds),
+ &v, &nv, PV_NO_DUPLICATE))
return CMD_FAILURE;
if (!lex_force_match (lexer, T_LPAREN)
}
while (lex_match (lexer, T_SLASH));
- return lex_end_of_command (lexer);
+ return CMD_SUCCESS;
/* If we have an error at a point where cleanup is required,
flow-of-control comes here. */
var_set_leave (v[i], true);
free (v);
- return lex_end_of_command (lexer);
+ return CMD_SUCCESS;
}