X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Flanguage%2Fxforms%2Fselect-if.c;h=4110f9089b2f3d19bc94b73343ec16c5f709ea3b;hb=23c5ab34eec1b2c2fef34155620c7cab670175f0;hp=1466222b99622bebf28a51736898c88a75f170dd;hpb=68af3306969829d17a05cfab5c9d46cb920b7607;p=pspp
diff --git a/src/language/xforms/select-if.c b/src/language/xforms/select-if.c
index 1466222b99..4110f9089b 100644
--- a/src/language/xforms/select-if.c
+++ b/src/language/xforms/select-if.c
@@ -1,36 +1,35 @@
-/* PSPP - computes sample statistics.
- Copyright (C) 1997-9, 2000 Free Software Foundation, Inc.
+/* PSPP - a program for statistical analysis.
+ Copyright (C) 1997-9, 2000, 2009, 2010, 2011 Free Software Foundation, Inc.
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License as
- published by the Free Software Foundation; either version 2 of the
- License, or (at your option) any later version.
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
- This program is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- 02110-1301, USA. */
+ along with this program. If not, see . */
#include
#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
+#include "data/dataset.h"
+#include "data/dictionary.h"
+#include "data/transformations.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/message.h"
+#include "libpspp/str.h"
+
+#include "gl/xalloc.h"
#include "gettext.h"
#define _(msgid) gettext (msgid)
@@ -55,7 +54,7 @@ cmd_select_if (struct lexer *lexer, struct dataset *ds)
if (!e)
return CMD_CASCADING_FAILURE;
- if (lex_token (lexer) != '.')
+ if (lex_token (lexer) != T_ENDCMD)
{
expr_free (e);
lex_error (lexer, _("expecting end of command"));
@@ -71,11 +70,11 @@ cmd_select_if (struct lexer *lexer, struct dataset *ds)
/* Performs the SELECT IF transformation T on case C. */
static int
-select_if_proc (void *t_, struct ccase *c,
+select_if_proc (void *t_, struct ccase **c,
casenumber case_num)
{
struct select_if_trns *t = t_;
- return (expr_evaluate_num (t->e, c, case_num) == 1.0
+ return (expr_evaluate_num (t->e, *c, case_num) == 1.0
? TRNS_CONTINUE : TRNS_DROP_CASE);
}
@@ -96,7 +95,7 @@ cmd_filter (struct lexer *lexer, struct dataset *ds)
struct dictionary *dict = dataset_dict (ds);
if (lex_match_id (lexer, "OFF"))
dict_set_filter (dict, NULL);
- else if (lex_token (lexer) == '.')
+ else if (lex_token (lexer) == T_ENDCMD)
{
msg (SW, _("Syntax error expecting OFF or BY. "
"Turning off case filtering."));
@@ -126,5 +125,5 @@ cmd_filter (struct lexer *lexer, struct dataset *ds)
dict_set_filter (dict, v);
}
- return lex_end_of_command (lexer);
+ return CMD_SUCCESS;
}