-/* PSPP - computes sample statistics.
+/* PSPP - a program for statistical analysis.
Copyright (C) 1997-9, 2000, 2006 Free Software Foundation, Inc.
- Written by Ben Pfaff <blp@gnu.org>.
- 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 the Free Software Foundation; either version 2 of the
- License, or (at your option) any later version.
+ 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
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
- This program is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- 02110-1301, USA. */
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include <config.h>
#include <data/procedure.h>
#include <data/variable.h>
+#include <data/format.h>
#include <language/command.h>
#include <language/lexer/format-parser.h>
#include <language/lexer/lexer.h>
FORMATS_WRITE = 002
};
-static int internal_cmd_formats (struct dataset *ds, int);
+static int internal_cmd_formats (struct lexer *, struct dataset *ds, int);
int
-cmd_print_formats (struct dataset *ds)
+cmd_print_formats (struct lexer *lexer, struct dataset *ds)
{
- return internal_cmd_formats (ds, FORMATS_PRINT);
+ return internal_cmd_formats (lexer, ds, FORMATS_PRINT);
}
int
-cmd_write_formats (struct dataset *ds)
+cmd_write_formats (struct lexer *lexer, struct dataset *ds)
{
- return internal_cmd_formats (ds, FORMATS_WRITE);
+ return internal_cmd_formats (lexer, ds, FORMATS_WRITE);
}
int
-cmd_formats (struct dataset *ds)
+cmd_formats (struct lexer *lexer, struct dataset *ds)
{
- return internal_cmd_formats (ds, FORMATS_PRINT | FORMATS_WRITE);
+ return internal_cmd_formats (lexer, ds, FORMATS_PRINT | FORMATS_WRITE);
}
static int
-internal_cmd_formats (struct dataset *ds, int which)
+internal_cmd_formats (struct lexer *lexer, struct dataset *ds, int which)
{
/* Variables. */
struct variable **v;
for (;;)
{
- if (token == '.')
+ if (lex_token (lexer) == '.')
break;
- if (!parse_variables (dataset_dict (ds), &v, &cv, PV_NUMERIC))
+ if (!parse_variables (lexer, dataset_dict (ds), &v, &cv, PV_NUMERIC))
return CMD_FAILURE;
- type = v[0]->type;
+ type = var_get_type (v[0]);
- if (!lex_match ('('))
+ if (!lex_match (lexer, '('))
{
msg (SE, _("`(' expected after variable list."));
goto fail;
}
- if (!parse_format_specifier (&f)
+ if (!parse_format_specifier (lexer, &f)
|| !fmt_check_output (&f)
- || !fmt_check_type_compat (&f, NUMERIC))
+ || !fmt_check_type_compat (&f, VAL_NUMERIC))
goto fail;
- if (!lex_match (')'))
+ if (!lex_match (lexer, ')'))
{
msg (SE, _("`)' expected after output format."));
goto fail;
for (i = 0; i < cv; i++)
{
if (which & FORMATS_PRINT)
- v[i]->print = f;
+ var_set_print_format (v[i], &f);
if (which & FORMATS_WRITE)
- v[i]->write = f;
+ var_set_write_format (v[i], &f);
}
free (v);
v = NULL;