From aacb81b15f6b8b34def3ef7b76c7d069a64bc5d8 Mon Sep 17 00:00:00 2001 From: Ben Pfaff Date: Sat, 6 May 2006 21:13:08 +0000 Subject: [PATCH] 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. --- src/language/xforms/ChangeLog | 7 +++++++ src/language/xforms/select-if.c | 14 ++++++++++---- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/src/language/xforms/ChangeLog b/src/language/xforms/ChangeLog index 894e2990..b48427d5 100644 --- a/src/language/xforms/ChangeLog +++ b/src/language/xforms/ChangeLog @@ -1,3 +1,10 @@ +Sat May 6 14:08:42 2006 Ben Pfaff + + * 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 Continue reforming procedure execution. In this phase, remove diff --git a/src/language/xforms/select-if.c b/src/language/xforms/select-if.c index f5b55ff9..ddeb4a05 100644 --- 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,22 +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; + return lex_end_of_command (); } -- 2.30.2