Encapsulated the static data of procedure.[ch] into a single object, to be

[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 5f15b43ebe1aed6d932e55490d07e57677a1d155..8e4c0e91c6ec53c867ab13067a5a1745bd7177d9 100644 (file)
--- a/src/language/xforms/select-if.c
+++ b/src/language/xforms/select-if.c
@@ -18,15 +18,20 @@
    02110-1301, USA. */
 
 #include <config.h>
+
 #include <stdlib.h>
-#include <libpspp/alloc.h>
-#include <language/command.h>
+
 #include <data/dictionary.h>
-#include <libpspp/message.h>
+#include <data/transformations.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>
-#include <data/variable.h>
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
@@ -47,7 +52,7 @@ cmd_select_if (void)
   struct expression *e;
   struct select_if_trns *t;
 
-  e = expr_parse (default_dict, EXPR_BOOLEAN);
+  e = expr_parse (dataset_dict (current_dataset), EXPR_BOOLEAN);
   if (!e)
     return CMD_CASCADING_FAILURE;
 
@@ -60,7 +65,7 @@ cmd_select_if (void)
 
   t = xmalloc (sizeof *t);
   t->e = e;
-  add_transformation (select_if_proc, select_if_free, t);
+  add_transformation (current_dataset, select_if_proc, select_if_free, t);
 
   return CMD_SUCCESS;
 }
@@ -68,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)
+                casenum_t case_num)
 {
   struct select_if_trns *t = t_;
   return (expr_evaluate_num (t->e, c, case_num) == 1.0
@@ -90,7 +95,13 @@ int
 cmd_filter (void)
 {
   if (lex_match_id ("OFF"))
-    dict_set_filter (default_dict, NULL);
+    dict_set_filter (dataset_dict (current_dataset), NULL);
+  else if (token == '.') 
+    {
+      msg (SW, _("Syntax error expecting OFF or BY.  "
+                 "Turning off case filtering."));
+      dict_set_filter (dataset_dict (current_dataset), NULL);
+    }
   else
     {
       struct variable *v;
@@ -98,52 +109,22 @@ cmd_filter (void)
       lex_match (T_BY);
       v = parse_variable ();
       if (!v)
-       return CMD_CASCADING_FAILURE;
+       return CMD_FAILURE;
 
       if (v->type == ALPHA)
        {
          msg (SE, _("The filter variable must be numeric."));
-         return CMD_CASCADING_FAILURE;
+         return CMD_FAILURE;
        }
 
       if (dict_class_from_id (v->name) == 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 (dataset_dict (current_dataset), 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 (MW, _("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 ();
 }