Added most of the calculations for the ONEWAY command.

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

diff --git a/src/sel-if.c b/src/sel-if.c
index 514c44711a78bd5df5af762d74054876ab29edfd..6f6f2d0279269083acb9e072e6648d9c9bf73285 100644 (file)
--- a/src/sel-if.c
+++ b/src/sel-if.c
@@ -43,10 +43,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 (EXPR_BOOLEAN);
   if (!e)
     return CMD_FAILURE;
 
@@ -86,8 +83,6 @@ select_if_free (struct trns_header * t)
 int
 cmd_filter (void)
 {
-  lex_match_id ("FILTER");
-
   if (lex_match_id ("OFF"))
     dict_set_filter (default_dict, NULL);
   else
@@ -105,7 +100,7 @@ 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;
@@ -125,10 +120,7 @@ cmd_process_if (void)
 {
   struct expression *e;
 
-  lex_match_id ("PROCESS");
-  lex_match_id ("IF");
-
-  e = expr_parse (PXP_BOOLEAN);
+  e = expr_parse (EXPR_BOOLEAN);
   if (!e)
     return CMD_FAILURE;