X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fxforms%2Fselect-if.c;h=e6dc9b4bb0b291c4c21a2f4b5a4a035b3b7e2f30;hb=755ecfd2e8d86bc134fe7202c46fee354ec166d0;hp=23426edd48327ddeda91259dc87b5151fb67ed80;hpb=dcf9b154cbcaa35c3d8459a201b77eec8bcb30bd;p=pspp-builds.git

diff --git a/src/language/xforms/select-if.c b/src/language/xforms/select-if.c
index 23426edd..e6dc9b4b 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 "alloc.h"
-#include "command.h"
-#include "dictionary.h"
-#include "message.h"
-#include "expressions/public.h"
-#include "lexer.h"
-#include "str.h"
-#include "variable.h"
+
+#include <data/dictionary.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 "gettext.h"
 #define _(msgid) gettext (msgid)
@@ -91,6 +96,12 @@ cmd_filter (void)
 {
   if (lex_match_id ("OFF"))
     dict_set_filter (default_dict, NULL);
+  else if (token == '.') 
+    {
+      msg (SW, _("Syntax error expecting OFF or BY.  "
+                 "Turning off case filtering."));
+      dict_set_filter (default_dict, 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);
     }
 
-  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 ();
 }