/* PSPP - computes sample statistics.
- Copyright (C) 1997-9, 2000 Free Software Foundation, Inc.
+ 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
FORMATS_WRITE = 002
};
-static int internal_cmd_formats (int);
+static int internal_cmd_formats (struct lexer *, struct dataset *ds, int);
int
-cmd_print_formats (void)
+cmd_print_formats (struct lexer *lexer, struct dataset *ds)
{
- return internal_cmd_formats (FORMATS_PRINT);
+ return internal_cmd_formats (lexer, ds, FORMATS_PRINT);
}
int
-cmd_write_formats (void)
+cmd_write_formats (struct lexer *lexer, struct dataset *ds)
{
- return internal_cmd_formats (FORMATS_WRITE);
+ return internal_cmd_formats (lexer, ds, FORMATS_WRITE);
}
int
-cmd_formats (void)
+cmd_formats (struct lexer *lexer, struct dataset *ds)
{
- return internal_cmd_formats (FORMATS_PRINT | FORMATS_WRITE);
+ return internal_cmd_formats (lexer, ds, FORMATS_PRINT | FORMATS_WRITE);
}
-int
-internal_cmd_formats (int which)
+static int
+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 (default_dict, &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"));
+ msg (SE, _("`(' expected after variable list."));
goto fail;
}
- if (!parse_format_specifier (&f)
- || !check_output_specifier (&f, true)
- || !check_specifier_type (&f, NUMERIC, true))
+ if (!parse_format_specifier (lexer, &f)
+ || !fmt_check_output (&f)
+ || !fmt_check_type_compat (&f, 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;