X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fdictionary%2Fmissing-values.c;h=819b0a9021cfe5821b4060e02b9932830b2a6120;hb=8830c95bb9e8d72621787866141a27fc22e8c786;hp=5d12155890478a65fbf7dee8335d98ddb3e29151;hpb=244ade48f9c233532cc535d3233fdef53bf9266b;p=pspp-builds.git diff --git a/src/language/dictionary/missing-values.c b/src/language/dictionary/missing-values.c index 5d121558..819b0a90 100644 --- a/src/language/dictionary/missing-values.c +++ b/src/language/dictionary/missing-values.c @@ -1,34 +1,33 @@ -/* PSPP - computes sample statistics. - Copyright (C) 1997-9, 2000 Free Software Foundation, Inc. - Written by Ben Pfaff . +/* PSPP - a program for statistical analysis. + Copyright (C) 1997-9, 2000, 2006, 2009 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 #include #include #include @@ -37,7 +36,7 @@ #define _(msgid) gettext (msgid) int -cmd_missing_values (struct dataset *ds) +cmd_missing_values (struct lexer *lexer, struct dataset *ds) { struct variable **v; size_t nv; @@ -45,109 +44,113 @@ cmd_missing_values (struct dataset *ds) int retval = CMD_FAILURE; bool deferred_errors = false; - while (token != '.') + while (lex_token (lexer) != '.') { size_t i; - if (!parse_variables (dataset_dict (ds), &v, &nv, PV_NONE)) + if (!parse_variables (lexer, dataset_dict (ds), &v, &nv, PV_NONE)) goto done; - if (!lex_match ('(')) + if (!lex_match (lexer, '(')) { - lex_error (_("expecting `('")); + lex_error (lexer, _("expecting `('")); goto done; } for (i = 0; i < nv; i++) - mv_init (&v[i]->miss, v[i]->width); + var_clear_missing_values (v[i]); - if (!lex_match (')')) + if (!lex_match (lexer, ')')) { struct missing_values mv; for (i = 0; i < nv; i++) - if (v[i]->type != v[0]->type) + if (var_get_type (v[i]) != var_get_type (v[0])) { - const struct variable *n = v[0]->type == NUMERIC ? v[0] : v[i]; - const struct variable *s = v[0]->type == NUMERIC ? v[i] : v[0]; + const struct variable *n = var_is_numeric (v[0]) ? v[0] : v[i]; + const struct variable *s = var_is_numeric (v[0]) ? v[i] : v[0]; msg (SE, _("Cannot mix numeric variables (e.g. %s) and " "string variables (e.g. %s) within a single list."), - n->name, s->name); + var_get_name (n), var_get_name (s)); goto done; } - if (v[0]->type == NUMERIC) + if (var_is_numeric (v[0])) { mv_init (&mv, 0); - while (!lex_match (')')) + while (!lex_match (lexer, ')')) { + enum fmt_type type = var_get_print_format (v[0])->type; double x, y; bool ok; - if (!parse_num_range (&x, &y, &v[0]->print)) + if (!parse_num_range (lexer, &x, &y, &type)) goto done; - + ok = (x == y ? mv_add_num (&mv, x) - : mv_add_num_range (&mv, x, y)); + : mv_add_range (&mv, x, y)); if (!ok) deferred_errors = true; - lex_match (','); + lex_match (lexer, ','); } } - else + else { - mv_init (&mv, MAX_SHORT_STRING); - while (!lex_match (')')) + mv_init (&mv, MV_MAX_STRING); + while (!lex_match (lexer, ')')) { - if (!lex_force_string ()) + uint8_t value[MV_MAX_STRING]; + size_t length; + + if (!lex_force_string (lexer)) { deferred_errors = true; break; } - if (ds_length (&tokstr) > MAX_SHORT_STRING) + length = ds_length (lex_tokstr (lexer)); + if (length > MV_MAX_STRING) { - ds_truncate (&tokstr, MAX_SHORT_STRING); - msg (SE, _("Truncating missing value to short string " - "length (%d characters)."), - MAX_SHORT_STRING); + msg (SE, _("Truncating missing value to maximum " + "acceptable length (%d bytes)."), + MV_MAX_STRING); + length = MV_MAX_STRING; } - else - ds_rpad (&tokstr, MAX_SHORT_STRING, ' '); + memset (value, ' ', MV_MAX_STRING); + memcpy (value, ds_data (lex_tokstr (lexer)), length); - if (!mv_add_str (&mv, ds_data (&tokstr))) + if (!mv_add_str (&mv, value)) deferred_errors = true; - lex_get (); - lex_match (','); + lex_get (lexer); + lex_match (lexer, ','); } } - - for (i = 0; i < nv; i++) + + for (i = 0; i < nv; i++) { - if (!mv_is_resizable (&mv, v[i]->width)) + if (mv_is_resizable (&mv, var_get_width (v[i]))) + var_set_missing_values (v[i], &mv); + else { msg (SE, _("Missing values provided are too long to assign " "to variable of width %d."), - v[i]->width); + var_get_width (v[i])); deferred_errors = true; } - else - { - mv_copy (&v[i]->miss, &mv); - mv_resize (&v[i]->miss, v[i]->width); - } } + + mv_destroy (&mv); } - lex_match ('/'); + lex_match (lexer, '/'); free (v); v = NULL; } - retval = lex_end_of_command (); - + retval = lex_end_of_command (lexer); + done: free (v); if (deferred_errors)