Encapsulated lexer and updated calling functions accordingly.

[pspp-builds.git] / src / language / xforms / select-if.c

diff --git a/src/language/xforms/select-if.c b/src/language/xforms/select-if.c
index e6dc9b4bb0b291c4c21a2f4b5a4a035b3b7e2f30..2543760be805de26f3a90e144ec4f77d3d95dc06 100644 (file)
--- a/src/language/xforms/select-if.c
+++ b/src/language/xforms/select-if.c
@@ -47,25 +47,25 @@ static trns_free_func select_if_free;
 
 /* 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;
 }
@@ -73,7 +73,7 @@ cmd_select_if (void)
 /* 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
@@ -92,22 +92,23 @@ select_if_free (void *t_)
 
 /* 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);
-  else if (token == '.') 
+  struct dictionary *dict = dataset_dict (ds);
+  if (lex_match_id (lexer, "OFF"))
+    dict_set_filter (dataset_dict (ds), NULL);
+  else if (lex_token (lexer) == '.') 
     {
       msg (SW, _("Syntax error expecting OFF or BY.  "
                  "Turning off case filtering."));
-      dict_set_filter (default_dict, NULL);
+      dict_set_filter (dataset_dict (ds), 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_FAILURE;
 
@@ -123,8 +124,8 @@ cmd_filter (void)
          return CMD_FAILURE;
        }
 
-      dict_set_filter (default_dict, v);
+      dict_set_filter (dict, v);
     }
 
-  return lex_end_of_command ();
+  return lex_end_of_command (lexer);
 }