X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fxforms%2Fselect-if.c;h=2543760be805de26f3a90e144ec4f77d3d95dc06;hb=b0ce74cb9ee2ac59e87bddb46122b63ae0b6cdf0;hp=5f15b43ebe1aed6d932e55490d07e57677a1d155;hpb=a19b858e0ac3c69e4a28c0ca6d8674427268a863;p=pspp

diff --git a/src/language/xforms/select-if.c b/src/language/xforms/select-if.c
index 5f15b43ebe..2543760be8 100644
--- 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)
@@ -42,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;
 }
@@ -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)
+                casenumber case_num)
 {
   struct select_if_trns *t = t_;
   return (expr_evaluate_num (t->e, c, case_num) == 1.0
@@ -87,63 +92,40 @@ 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);
+  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 (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_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 (dict, v);
     }
 
-  return CMD_SUCCESS;
-}
-
-/* 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 (lexer);
 }