/* 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
#include <data/dictionary.h>
#include <data/transformations.h>
-#include <procedure.h>
+#include <data/procedure.h>
#include <data/variable.h>
#include <language/command.h>
#include <language/expressions/public.h>
#include <language/lexer/lexer.h>
+#include <language/lexer/variable-parser.h>
#include <libpspp/alloc.h>
#include <libpspp/message.h>
#include <libpspp/str.h>
/* Parses the SELECT IF transformation. */
int
-cmd_select_if (void)
+cmd_select_if (struct lexer *lexer, struct dataset *ds)
{
struct expression *e;
struct select_if_trns *t;
- e = expr_parse (default_dict, EXPR_BOOLEAN);
+ e = expr_parse (lexer, ds, EXPR_BOOLEAN);
if (!e)
return CMD_CASCADING_FAILURE;
- if (token != '.')
+ if (lex_token (lexer) != '.')
{
expr_free (e);
- lex_error (_("expecting end of command"));
+ lex_error (lexer, _("expecting end of command"));
return CMD_CASCADING_FAILURE;
}
t = xmalloc (sizeof *t);
t->e = e;
- add_transformation (select_if_proc, select_if_free, t);
+ add_transformation (ds, select_if_proc, select_if_free, t);
return CMD_SUCCESS;
}
/* Performs the SELECT IF transformation T on case C. */
static int
select_if_proc (void *t_, struct ccase *c,
- int case_num)
+ casenumber case_num)
{
struct select_if_trns *t = t_;
return (expr_evaluate_num (t->e, c, case_num) == 1.0
/* Parses the FILTER command. */
int
-cmd_filter (void)
+cmd_filter (struct lexer *lexer, struct dataset *ds)
{
- if (lex_match_id ("OFF"))
- dict_set_filter (default_dict, NULL);
+ struct dictionary *dict = dataset_dict (ds);
+ if (lex_match_id (lexer, "OFF"))
+ 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 (dict, NULL);
+ }
else
{
struct variable *v;
- lex_match (T_BY);
- v = parse_variable ();
+ lex_match (lexer, T_BY);
+ v = parse_variable (lexer, dict);
if (!v)
- return CMD_CASCADING_FAILURE;
+ return CMD_FAILURE;
- if (v->type == ALPHA)
+ if (var_is_alpha (v))
{
msg (SE, _("The filter variable must be numeric."));
- return CMD_CASCADING_FAILURE;
+ 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_CASCADING_FAILURE;
+ return CMD_FAILURE;
}
- dict_set_filter (default_dict, v);
+ dict_set_filter (dict, v);
}
- return CMD_SUCCESS;
-}
-\f
-/* Expression on PROCESS IF. */
-struct expression *process_if_expr;
-
-/* Parses the PROCESS IF command. */
-int
-cmd_process_if (void)
-{
- struct expression *e;
-
- e = expr_parse (default_dict, EXPR_BOOLEAN);
- if (!e)
- return CMD_FAILURE;
-
- if (token != '.')
- {
- expr_free (e);
- lex_error (_("expecting end of command"));
- return CMD_FAILURE;
- }
-
- if (process_if_expr)
- {
- msg (SW, _("Only last instance of this command is in effect."));
- expr_free (process_if_expr);
- }
- process_if_expr = e;
-
- return CMD_SUCCESS;
+ return lex_end_of_command (lexer);
}