Rewrite expression code.

[pspp-builds.git] / src / sel-if.c

diff --git a/src/sel-if.c b/src/sel-if.c
index f4afd9c65cbffe3cda2ae2c50db033a3c0d0464a..1df8ed4a8509af10d11f05628b24454031c8b909 100644 (file)
--- a/src/sel-if.c
+++ b/src/sel-if.c
@@ -20,8 +20,9 @@
 #include <config.h>
 #include "alloc.h"
 #include "command.h"
+#include "dictionary.h"
 #include "error.h"
-#include "expr.h"
+#include "expressions/public.h"
 #include "lexer.h"
 #include "str.h"
 #include "var.h"
@@ -33,8 +34,8 @@ struct select_if_trns
     struct expression *e;      /* Test expression. */
   };
 
-static int select_if_proc (struct trns_header *, struct ccase *);
-static void select_if_free (struct trns_header *);
+static trns_proc_func select_if_proc;
+static trns_free_func select_if_free;
 
 /* Parses the SELECT IF transformation. */
 int
@@ -43,10 +44,7 @@ cmd_select_if (void)
   struct expression *e;
   struct select_if_trns *t;
 
-  lex_match_id ("SELECT");
-  lex_match_id ("IF");
-
-  e = expr_parse (PXP_BOOLEAN);
+  e = expr_parse (default_dict, EXPR_BOOLEAN);
   if (!e)
     return CMD_FAILURE;
 
@@ -68,9 +66,11 @@ cmd_select_if (void)
 
 /* Performs the SELECT IF transformation T on case C. */
 static int
-select_if_proc (struct trns_header * t, struct ccase * c)
+select_if_proc (struct trns_header *t_, struct ccase *c,
+                int case_num)
 {
-  return (expr_evaluate (((struct select_if_trns *) t)->e, c, NULL) == 1.0) - 2;
+  struct select_if_trns *t = (struct select_if_trns *) t_;
+  return expr_evaluate_num (t->e, c, case_num) == 1.0 ? -1 : -2;
 }
 
 /* Frees SELECT IF transformation T. */
@@ -84,10 +84,8 @@ select_if_free (struct trns_header * t)
 int
 cmd_filter (void)
 {
-  lex_match_id ("FILTER");
-
   if (lex_match_id ("OFF"))
-    default_dict.filter_var[0] = 0;
+    dict_set_filter (default_dict, NULL);
   else
     {
       struct variable *v;
@@ -103,13 +101,13 @@ cmd_filter (void)
          return CMD_FAILURE;
        }
 
-      if (v->name[0] == '#')
+      if (dict_class_from_id (v->name) == DC_SCRATCH)
        {
          msg (SE, _("The filter variable may not be scratch."));
          return CMD_FAILURE;
        }
-      
-      strcpy (default_dict.filter_var, v->name);
+
+      dict_set_filter (default_dict, v);
 
       FILTER_before_TEMPORARY = !temporary;
     }
@@ -123,10 +121,7 @@ cmd_process_if (void)
 {
   struct expression *e;
 
-  lex_match_id ("PROCESS");
-  lex_match_id ("IF");
-
-  e = expr_parse (PXP_BOOLEAN);
+  e = expr_parse (default_dict, EXPR_BOOLEAN);
   if (!e)
     return CMD_FAILURE;