/* PSPP - computes sample statistics.
Copyright (C) 1997-9, 2000 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
{
struct dictionary *dict = dataset_dict (ds);
if (lex_match_id (lexer, "OFF"))
- dict_set_filter (dataset_dict (ds), NULL);
- else if (lex_token (lexer) == '.')
+ dict_set_filter (dict, NULL);
+ else if (lex_token (lexer) == '.')
{
msg (SW, _("Syntax error expecting OFF or BY. "
"Turning off case filtering."));
- dict_set_filter (dataset_dict (ds), NULL);
+ dict_set_filter (dict, NULL);
}
else
{
if (!v)
return CMD_FAILURE;
- if (v->type == ALPHA)
+ if (var_is_alpha (v))
{
msg (SE, _("The filter variable must be numeric."));
return CMD_FAILURE;
}
- if (dict_class_from_id (v->name) == DC_SCRATCH)
+ if (dict_class_from_id (var_get_name (v)) == DC_SCRATCH)
{
msg (SE, _("The filter variable may not be scratch."));
return CMD_FAILURE;