(dump_free) For SBC_DBL_LIST, enclose the output code in curly braces,

[pspp-builds.git] / src / language / xforms / select-if.c

diff --git a/src/language/xforms/select-if.c b/src/language/xforms/select-if.c
index 4666f52db9f1964a32df42a524e249089319dbc8..ddeb4a05f4e9187afc058217d044fd9f8becd3e2 100644 (file)
--- a/src/language/xforms/select-if.c
+++ b/src/language/xforms/select-if.c
@@ -95,6 +95,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;
@@ -102,52 +108,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;
-}
-\f
-/* 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 (SW, _("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 ();
 }