projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix bug 19581
[pspp]
/
src
/
language
/
xforms
/
select-if.c
diff --git
a/src/language/xforms/select-if.c
b/src/language/xforms/select-if.c
index 7acb3ec09aafa2017ef16175b79fd622f1d89046..1466222b99622bebf28a51736898c88a75f170dd 100644
(file)
--- a/
src/language/xforms/select-if.c
+++ b/
src/language/xforms/select-if.c
@@
-1,6
+1,5
@@
/* PSPP - computes sample statistics.
Copyright (C) 1997-9, 2000 Free Software Foundation, Inc.
/* PSPP - computes sample statistics.
Copyright (C) 1997-9, 2000 Free Software Foundation, Inc.
- Written by Ben Pfaff <blp@gnu.org>.
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as
@@
-47,25
+46,25
@@
static trns_free_func select_if_free;
/* Parses the SELECT IF transformation. */
int
/* Parses the SELECT IF transformation. */
int
-cmd_select_if (
void
)
+cmd_select_if (
struct lexer *lexer, struct dataset *ds
)
{
struct expression *e;
struct select_if_trns *t;
{
struct expression *e;
struct select_if_trns *t;
- e = expr_parse (
default_dict
, EXPR_BOOLEAN);
+ e = expr_parse (
lexer, ds
, EXPR_BOOLEAN);
if (!e)
return CMD_CASCADING_FAILURE;
if (!e)
return CMD_CASCADING_FAILURE;
- if (
token
!= '.')
+ if (
lex_token (lexer)
!= '.')
{
expr_free (e);
{
expr_free (e);
- lex_error (_("expecting end of command"));
+ lex_error (
lexer,
_("expecting end of command"));
return CMD_CASCADING_FAILURE;
}
t = xmalloc (sizeof *t);
t->e = e;
return CMD_CASCADING_FAILURE;
}
t = xmalloc (sizeof *t);
t->e = e;
- add_transformation (select_if_proc, select_if_free, t);
+ add_transformation (
ds,
select_if_proc, select_if_free, t);
return CMD_SUCCESS;
}
return CMD_SUCCESS;
}
@@
-73,7
+72,7
@@
cmd_select_if (void)
/* Performs the SELECT IF transformation T on case C. */
static int
select_if_proc (void *t_, struct ccase *c,
/* Performs the SELECT IF transformation T on case C. */
static int
select_if_proc (void *t_, struct ccase *c,
- casenum
_t
case_num)
+ casenum
ber
case_num)
{
struct select_if_trns *t = t_;
return (expr_evaluate_num (t->e, c, case_num) == 1.0
{
struct select_if_trns *t = t_;
return (expr_evaluate_num (t->e, c, case_num) == 1.0
@@
-92,39
+91,40
@@
select_if_free (void *t_)
/* Parses the FILTER command. */
int
/* Parses the FILTER command. */
int
-cmd_filter (
void
)
+cmd_filter (
struct lexer *lexer, struct dataset *ds
)
{
{
- if (lex_match_id ("OFF"))
- dict_set_filter (default_dict, NULL);
- else if (token == '.')
+ struct dictionary *dict = dataset_dict (ds);
+ if (lex_match_id (lexer, "OFF"))
+ dict_set_filter (dict, NULL);
+ else if (lex_token (lexer) == '.')
{
msg (SW, _("Syntax error expecting OFF or BY. "
"Turning off case filtering."));
{
msg (SW, _("Syntax error expecting OFF or BY. "
"Turning off case filtering."));
- dict_set_filter (d
efault_d
ict, NULL);
+ dict_set_filter (dict, NULL);
}
else
{
struct variable *v;
}
else
{
struct variable *v;
- lex_match (T_BY);
- v = parse_variable ();
+ lex_match (
lexer,
T_BY);
+ v = parse_variable (
lexer, dict
);
if (!v)
return CMD_FAILURE;
if (!v)
return CMD_FAILURE;
- if (v
->type == ALPHA
)
+ if (v
ar_is_alpha (v)
)
{
msg (SE, _("The filter variable must be numeric."));
return CMD_FAILURE;
}
{
msg (SE, _("The filter variable must be numeric."));
return CMD_FAILURE;
}
- if (dict_class_from_id (v
->name
) == DC_SCRATCH)
+ if (dict_class_from_id (v
ar_get_name (v)
) == DC_SCRATCH)
{
msg (SE, _("The filter variable may not be scratch."));
return CMD_FAILURE;
}
{
msg (SE, _("The filter variable may not be scratch."));
return CMD_FAILURE;
}
- dict_set_filter (d
efault_d
ict, v);
+ dict_set_filter (dict, v);
}
}
- return lex_end_of_command ();
+ return lex_end_of_command (
lexer
);
}
}