X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fxforms%2Fselect-if.c;h=deb13047e9fd7fcc49a18629e3ccb32d4417ebea;hb=9654a384b04ef5c35a9a305d65357262dcf52e70;hp=4240f63b47b94e2f79a972c4954e2275c457ab38;hpb=81579d9e9f994fb2908f50af41c3eb033d216e58;p=pspp

diff --git a/src/language/xforms/select-if.c b/src/language/xforms/select-if.c
index 4240f63b47..deb13047e9 100644
--- a/src/language/xforms/select-if.c
+++ b/src/language/xforms/select-if.c
@@ -18,8 +18,8 @@
 
 #include <stdlib.h>
 
+#include "data/dataset.h"
 #include "data/dictionary.h"
-#include "data/procedure.h"
 #include "data/transformations.h"
 #include "data/variable.h"
 #include "language/command.h"
@@ -40,8 +40,7 @@ struct select_if_trns
     struct expression *e;	/* Test expression. */
   };
 
-static trns_proc_func select_if_proc;
-static trns_free_func select_if_free;
+static const struct trns_class select_if_trns_class;
 
 /* Parses the SELECT IF transformation. */
 int
@@ -50,7 +49,7 @@ cmd_select_if (struct lexer *lexer, struct dataset *ds)
   struct expression *e;
   struct select_if_trns *t;
 
-  e = expr_parse (lexer, ds, EXPR_BOOLEAN);
+  e = expr_parse_bool (lexer, ds);
   if (!e)
     return CMD_CASCADING_FAILURE;
 
@@ -63,13 +62,13 @@ cmd_select_if (struct lexer *lexer, struct dataset *ds)
 
   t = xmalloc (sizeof *t);
   t->e = e;
-  add_transformation (ds, select_if_proc, select_if_free, t);
+  add_transformation (ds, &select_if_trns_class, t);
 
   return CMD_SUCCESS;
 }
 
 /* Performs the SELECT IF transformation T on case C. */
-static int
+static enum trns_result
 select_if_proc (void *t_, struct ccase **c,
                 casenumber case_num)
 {
@@ -88,6 +87,12 @@ select_if_free (void *t_)
   return true;
 }
 
+static const struct trns_class select_if_trns_class = {
+  .name = "SELECT IF",
+  .execute = select_if_proc,
+  .destroy = select_if_free,
+};
+
 /* Parses the FILTER command. */
 int
 cmd_filter (struct lexer *lexer, struct dataset *ds)
@@ -125,5 +130,5 @@ cmd_filter (struct lexer *lexer, struct dataset *ds)
       dict_set_filter (dict, v);
     }
 
-  return lex_end_of_command (lexer);
+  return CMD_SUCCESS;
 }