X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fdictionary%2Fvalue-labels.c;h=39f544ec4b917fa2b517129a06ad6c252d5cc171;hb=47e6024280cbc95dbfa637009091cc8404c84fb0;hp=65b8762ecedc8aed047517f727e1d2741c126caa;hpb=3816248a008a4af75aac6319d0c9929cb7ff679e;p=pspp-builds.git diff --git a/src/language/dictionary/value-labels.c b/src/language/dictionary/value-labels.c index 65b8762e..39f544ec 100644 --- a/src/language/dictionary/value-labels.c +++ b/src/language/dictionary/value-labels.c @@ -1,21 +1,18 @@ -/* PSPP - computes sample statistics. +/* PSPP - a program for statistical analysis. 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 - 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 @@ -28,18 +25,19 @@ #include #include #include -#include #include #include #include +#include "xalloc.h" + #include "gettext.h" #define _(msgid) gettext (msgid) /* Declarations. */ -static int do_value_labels (struct lexer *, - const struct dictionary *dict, int); +static int do_value_labels (struct lexer *, + const struct dictionary *dict, bool); static int verify_val_labs (struct variable **vars, size_t var_cnt); static void erase_labels (struct variable **vars, size_t var_cnt); static int get_label (struct lexer *, struct variable **vars, size_t var_cnt); @@ -49,29 +47,29 @@ static int get_label (struct lexer *, struct variable **vars, size_t var_cnt); int cmd_value_labels (struct lexer *lexer, struct dataset *ds) { - return do_value_labels (lexer, dataset_dict (ds), 1); + return do_value_labels (lexer, dataset_dict (ds), true); } int cmd_add_value_labels (struct lexer *lexer, struct dataset *ds) { - return do_value_labels (lexer, dataset_dict (ds), 0); + return do_value_labels (lexer, dataset_dict (ds), false); } /* Do it. */ static int -do_value_labels (struct lexer *lexer, const struct dictionary *dict, int erase) +do_value_labels (struct lexer *lexer, const struct dictionary *dict, bool erase) { struct variable **vars; /* Variable list. */ size_t var_cnt; /* Number of variables. */ int parse_err=0; /* true if error parsing variables */ lex_match (lexer, '/'); - + while (lex_token (lexer) != '.') { - parse_err = !parse_variables (lexer, dict, &vars, &var_cnt, + parse_err = !parse_variables (lexer, dict, &vars, &var_cnt, PV_SAME_TYPE) ; if (var_cnt < 1) { @@ -88,8 +86,8 @@ do_value_labels (struct lexer *lexer, const struct dictionary *dict, int erase) if (lex_token (lexer) != '/') { - free (vars); - break; + free (vars); + break; } lex_get (lexer); @@ -116,12 +114,12 @@ verify_val_labs (struct variable **vars, size_t var_cnt) for (i = 0; i < var_cnt; i++) { - struct variable *vp = vars[i]; + const struct variable *vp = vars[i]; - if (vp->type == ALPHA && vp->width > MAX_SHORT_STRING) + if (var_is_long_string (vp)) { msg (SE, _("It is not possible to assign value labels to long " - "string variables such as %s."), vp->name); + "string variables such as %s."), var_get_name (vp)); return 0; } } @@ -130,13 +128,13 @@ verify_val_labs (struct variable **vars, size_t var_cnt) /* Erases all the labels for the VAR_CNT variables in VARS. */ static void -erase_labels (struct variable **vars, size_t var_cnt) +erase_labels (struct variable **vars, size_t var_cnt) { size_t i; /* Erase old value labels if desired. */ for (i = 0; i < var_cnt; i++) - val_labs_clear (vars[i]->val_labs); + var_clear_value_labels (vars[i]); } /* Parse all the labels for the VAR_CNT variables in VARS and add @@ -152,7 +150,7 @@ get_label (struct lexer *lexer, struct variable **vars, size_t var_cnt) size_t i; /* Set value. */ - if (vars[0]->type == ALPHA) + if (var_is_alpha (vars[0])) { if (lex_token (lexer) != T_STRING) { @@ -165,19 +163,18 @@ get_label (struct lexer *lexer, struct variable **vars, size_t var_cnt) { if (!lex_is_number (lexer)) { - lex_error (lexer, _("expecting integer")); + lex_error (lexer, _("expecting number")); return 0; } - if (!lex_is_integer (lexer)) - msg (SW, _("Value label `%g' is not integer."), lex_tokval (lexer)); value.f = lex_tokval (lexer); } lex_get (lexer); + lex_match (lexer, ','); /* Set label. */ if (!lex_force_string (lexer)) return 0; - + ds_init_string (&label, lex_tokstr (lexer)); if (ds_length (&label) > 60) @@ -187,11 +184,12 @@ get_label (struct lexer *lexer, struct variable **vars, size_t var_cnt) } for (i = 0; i < var_cnt; i++) - val_labs_replace (vars[i]->val_labs, value, ds_cstr (&label)); + var_replace_value_label (vars[i], &value, ds_cstr (&label)); ds_destroy (&label); lex_get (lexer); + lex_match (lexer, ','); } while (lex_token (lexer) != '/' && lex_token (lexer) != '.');