X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Flanguage%2Fxforms%2Fcount.c;h=5cfc0515191e8e90f5c6fa9beb91ccecd51b567d;hb=a4f8860c584ccc9ffa7d06f711bd051006ba45ef;hp=e5f3991a620c14c073f99203deb30fb55c1e3fc0;hpb=dcf9b154cbcaa35c3d8459a201b77eec8bcb30bd;p=pspp-builds.git diff --git a/src/language/xforms/count.c b/src/language/xforms/count.c index e5f3991a..5cfc0515 100644 --- a/src/language/xforms/count.c +++ b/src/language/xforms/count.c @@ -1,6 +1,5 @@ /* PSPP - computes sample statistics. Copyright (C) 1997-9, 2000 Free Software Foundation, Inc. - Written by Ben Pfaff . This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -18,18 +17,24 @@ 02110-1301, USA. */ #include -#include "message.h" + #include -#include "alloc.h" -#include "case.h" -#include "command.h" -#include "dictionary.h" -#include "message.h" -#include "lexer.h" -#include "pool.h" -#include "range-parser.h" -#include "str.h" -#include "variable.h" + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include "gettext.h" #define _(msgid) gettext (msgid) @@ -56,7 +61,7 @@ struct criteria struct variable **vars; size_t var_cnt; - /* Count special values?. */ + /* Count special values? */ bool count_system_missing; /* Count system missing? */ bool count_user_missing; /* Count user missing? */ @@ -87,11 +92,11 @@ struct count_trns static trns_proc_func count_trns_proc; static trns_free_func count_trns_free; -static bool parse_numeric_criteria (struct pool *, struct criteria *); -static bool parse_string_criteria (struct pool *, struct criteria *); +static bool parse_numeric_criteria (struct lexer *, struct pool *, struct criteria *); +static bool parse_string_criteria (struct lexer *, struct pool *, struct criteria *); int -cmd_count (void) +cmd_count (struct lexer *lexer, struct dataset *ds) { struct dst_var *dv; /* Destination var being parsed. */ struct count_trns *trns; /* Transformation. */ @@ -109,22 +114,22 @@ cmd_count (void) dv->crit = NULL; /* Get destination variable, or at least its name. */ - if (!lex_force_id ()) + if (!lex_force_id (lexer)) goto fail; - dv->var = dict_lookup_var (default_dict, tokid); + dv->var = dict_lookup_var (dataset_dict (ds), lex_tokid (lexer)); if (dv->var != NULL) { - if (dv->var->type == ALPHA) + if (var_is_alpha (dv->var)) { msg (SE, _("Destination cannot be a string variable.")); goto fail; } } else - dv->name = pool_strdup (trns->pool, tokid); + dv->name = pool_strdup (trns->pool, lex_tokid (lexer)); - lex_get (); - if (!lex_force_match ('=')) + lex_get (lexer); + if (!lex_force_match (lexer, '=')) goto fail; crit = dv->crit = pool_alloc (trns->pool, sizeof *crit); @@ -134,32 +139,32 @@ cmd_count (void) crit->next = NULL; crit->vars = NULL; - if (!parse_variables (default_dict, &crit->vars, &crit->var_cnt, + if (!parse_variables (lexer, dataset_dict (ds), &crit->vars, &crit->var_cnt, PV_DUPLICATE | PV_SAME_TYPE)) goto fail; pool_register (trns->pool, free, crit->vars); - if (!lex_force_match ('(')) + if (!lex_force_match (lexer, '(')) goto fail; crit->value_cnt = 0; - if (crit->vars[0]->type == NUMERIC) - ok = parse_numeric_criteria (trns->pool, crit); + if (var_is_numeric (crit->vars[0])) + ok = parse_numeric_criteria (lexer, trns->pool, crit); else - ok = parse_string_criteria (trns->pool, crit); + ok = parse_string_criteria (lexer, trns->pool, crit); if (!ok) goto fail; - if (token == '/' || token == '.') + if (lex_token (lexer) == '/' || lex_token (lexer) == '.') break; crit = crit->next = pool_alloc (trns->pool, sizeof *crit); } - if (token == '.') + if (lex_token (lexer) == '.') break; - if (!lex_force_match ('/')) + if (!lex_force_match (lexer, '/')) goto fail; dv = dv->next = pool_alloc (trns->pool, sizeof *dv); } @@ -170,13 +175,13 @@ cmd_count (void) { /* It's valid, though motivationally questionable, to count to the same dest var more than once. */ - dv->var = dict_lookup_var (default_dict, dv->name); + dv->var = dict_lookup_var (dataset_dict (ds), dv->name); if (dv->var == NULL) - dv->var = dict_create_var_assert (default_dict, dv->name, 0); + dv->var = dict_create_var_assert (dataset_dict (ds), dv->name, 0); } - add_transformation (count_trns_proc, count_trns_free, trns); + add_transformation (ds, count_trns_proc, count_trns_free, trns); return CMD_SUCCESS; fail: @@ -186,7 +191,7 @@ fail: /* Parses a set of numeric criterion values. Returns success. */ static bool -parse_numeric_criteria (struct pool *pool, struct criteria *crit) +parse_numeric_criteria (struct lexer *lexer, struct pool *pool, struct criteria *crit) { size_t allocated = 0; @@ -197,11 +202,11 @@ parse_numeric_criteria (struct pool *pool, struct criteria *crit) { double low, high; - if (lex_match_id ("SYSMIS")) + if (lex_match_id (lexer, "SYSMIS")) crit->count_system_missing = true; - else if (lex_match_id ("MISSING")) + else if (lex_match_id (lexer, "MISSING")) crit->count_user_missing = true; - else if (parse_num_range (&low, &high, NULL)) + else if (parse_num_range (lexer, &low, &high, NULL)) { struct num_value *cur; @@ -217,8 +222,8 @@ parse_numeric_criteria (struct pool *pool, struct criteria *crit) else return false; - lex_match (','); - if (lex_match (')')) + lex_match (lexer, ','); + if (lex_match (lexer, ')')) break; } return true; @@ -226,15 +231,15 @@ parse_numeric_criteria (struct pool *pool, struct criteria *crit) /* Parses a set of string criteria values. Returns success. */ static bool -parse_string_criteria (struct pool *pool, struct criteria *crit) +parse_string_criteria (struct lexer *lexer, struct pool *pool, struct criteria *crit) { int len = 0; size_t allocated = 0; size_t i; for (i = 0; i < crit->var_cnt; i++) - if (crit->vars[i]->width > len) - len = crit->vars[i]->width; + if (var_get_width (crit->vars[i]) > len) + len = var_get_width (crit->vars[i]); crit->values.str = NULL; for (;;) @@ -245,15 +250,15 @@ parse_string_criteria (struct pool *pool, struct criteria *crit) &allocated, sizeof *crit->values.str); - if (!lex_force_string ()) + if (!lex_force_string (lexer)) return false; cur = &crit->values.str[crit->value_cnt++]; *cur = pool_alloc (pool, len + 1); - str_copy_rpad (*cur, len + 1, ds_c_str (&tokstr)); - lex_get (); + str_copy_rpad (*cur, len + 1, ds_cstr (lex_tokstr (lexer))); + lex_get (lexer); - lex_match (','); - if (lex_match (')')) + lex_match (lexer, ','); + if (lex_match (lexer, ')')) break; } @@ -271,12 +276,14 @@ count_numeric (struct criteria *crit, struct ccase *c) for (i = 0; i < crit->var_cnt; i++) { - double x = case_num (c, crit->vars[i]->fv); - if (x == SYSMIS) - counter += crit->count_system_missing; - else if (crit->count_user_missing - && mv_is_num_user_missing (&crit->vars[i]->miss, x)) - counter++; + double x = case_num (c, crit->vars[i]); + if (var_is_num_missing (crit->vars[i], x, MV_ANY)) + { + if (x == SYSMIS + ? crit->count_system_missing + : crit->count_user_missing) + counter++; + } else { struct num_value *v; @@ -305,8 +312,8 @@ count_string (struct criteria *crit, struct ccase *c) { char **v; for (v = crit->values.str; v < crit->values.str + crit->value_cnt; v++) - if (!memcmp (case_str (c, crit->vars[i]->fv), *v, - crit->vars[i]->width)) + if (!memcmp (case_str (c, crit->vars[i]), *v, + var_get_width (crit->vars[i]))) { counter++; break; @@ -319,7 +326,7 @@ count_string (struct criteria *crit, struct ccase *c) /* Performs the COUNT transformation T on case C. */ static int count_trns_proc (void *trns_, struct ccase *c, - int case_num UNUSED) + casenumber case_num UNUSED) { struct count_trns *trns = trns_; struct dst_var *dv; @@ -331,11 +338,11 @@ count_trns_proc (void *trns_, struct ccase *c, counter = 0; for (crit = dv->crit; crit; crit = crit->next) - if (crit->vars[0]->type == NUMERIC) + if (var_is_numeric (crit->vars[0])) counter += count_numeric (crit, c); else counter += count_string (crit, c); - case_data_rw (c, dv->var->fv)->f = counter; + case_data_rw (c, dv->var)->f = counter; } return TRNS_CONTINUE; }