[Pspp-cvs] pspp/src/language/xforms ChangeLog select-if.c

[Ben Pfaff]

CVSROOT:        /cvsroot/pspp
Module name:    pspp
Branch:         
Changes by:     Ben Pfaff <address@hidden>      06/05/06 21:13:08

Modified files:
        src/language/xforms: ChangeLog select-if.c 

Log message:
        Make FILTER without any further keywords turn off filtering, with a
        warning, for compatibility.  Change errors from cascading failures to
        ordinary failures.  Check for command terminator.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/xforms/ChangeLog.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/pspp/pspp/src/language/xforms/select-if.c.diff?tr1=1.6&tr2=1.7&r1=text&r2=text

Patches:
Index: pspp/src/language/xforms/ChangeLog
diff -u pspp/src/language/xforms/ChangeLog:1.3 
pspp/src/language/xforms/ChangeLog:1.4
--- pspp/src/language/xforms/ChangeLog:1.3      Sat May  6 20:27:23 2006
+++ pspp/src/language/xforms/ChangeLog  Sat May  6 21:13:08 2006
@@ -1,3 +1,10 @@
+Sat May  6 14:08:42 2006  Ben Pfaff  <address@hidden>
+
+       * select-if.c (cmd_filter): Make FILTER without any further
+       keywords turn off filtering, with a warning, for compatibility.
+       Change errors from cascading failures to ordinary failures.  Check
+       for command terminator.
+
 Sat May  6 13:25:57 2006  Ben Pfaff  <address@hidden>
 
        Continue reforming procedure execution.  In this phase, remove
Index: pspp/src/language/xforms/select-if.c
diff -u pspp/src/language/xforms/select-if.c:1.6 
pspp/src/language/xforms/select-if.c:1.7
--- pspp/src/language/xforms/select-if.c:1.6    Sat May  6 20:27:23 2006
+++ pspp/src/language/xforms/select-if.c        Sat May  6 21:13:08 2006
@@ -95,6 +95,12 @@
 {
   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,22 +108,22 @@
       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;
+  return lex_end_of_command ();
 }