X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fdictionary%2Fvalue-labels.c;h=5e3ea11f24654d0af73ff4cc1113123134bca00b;hb=6b562f8a8263930b8d1ed1862efec76f2511ed08;hp=5ac8fb52a2ca4e11dd0b436a2c71e301e7864a80;hpb=888d0f91d57e0c3c5a4206c30ac71eb87bf44227;p=pspp-builds.git diff --git a/src/language/dictionary/value-labels.c b/src/language/dictionary/value-labels.c index 5ac8fb52..5e3ea11f 100644 --- a/src/language/dictionary/value-labels.c +++ b/src/language/dictionary/value-labels.c @@ -1,21 +1,18 @@ -/* 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, 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 @@ -27,20 +24,21 @@ #include #include #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 verify_val_labs (struct variable **vars, size_t var_cnt); +static int do_value_labels (struct lexer *, + const struct dictionary *dict, bool); 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,37 +47,35 @@ 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, - PV_SAME_TYPE) ; + parse_err = !parse_variables (lexer, dict, &vars, &var_cnt, + PV_SAME_WIDTH); if (var_cnt < 1) { free(vars); return CMD_FAILURE; } - if (!verify_val_labs (vars, var_cnt)) - goto lossage; if (erase) erase_labels (vars, var_cnt); while (lex_token (lexer) != '/' && lex_token (lexer) != '.') @@ -107,36 +103,15 @@ do_value_labels (struct lexer *lexer, const struct dictionary *dict, int erase) return CMD_FAILURE; } -/* Verifies that none of the VAR_CNT variables in VARS are long - string variables. */ -static int -verify_val_labs (struct variable **vars, size_t var_cnt) -{ - size_t i; - - for (i = 0; i < var_cnt; i++) - { - struct variable *vp = vars[i]; - - if (var_is_long_string (vp)) - { - msg (SE, _("It is not possible to assign value labels to long " - "string variables such as %s."), var_get_name (vp)); - return 0; - } - } - return 1; -} - /* 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 @@ -147,38 +122,27 @@ get_label (struct lexer *lexer, struct variable **vars, size_t var_cnt) /* Parse all the labels and add them to the variables. */ do { + int width = var_get_width (vars[0]); union value value; struct string label; size_t i; /* Set value. */ - if (var_is_alpha (vars[0])) - { - if (lex_token (lexer) != T_STRING) - { - lex_error (lexer, _("expecting string")); - return 0; - } - buf_copy_str_rpad (value.s, MAX_SHORT_STRING, ds_cstr (lex_tokstr (lexer))); - } - else - { - if (!lex_is_number (lexer)) - { - lex_error (lexer, _("expecting integer")); - 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); + value_init (&value, width); + if (!parse_value (lexer, &value, width)) + { + value_destroy (&value, width); + return 0; + } lex_match (lexer, ','); /* Set label. */ - if (!lex_force_string (lexer)) - return 0; - + if (lex_token (lexer) != T_ID && !lex_force_string (lexer)) + { + value_destroy (&value, width); + return 0; + } + ds_init_string (&label, lex_tokstr (lexer)); if (ds_length (&label) > 60) @@ -188,9 +152,10 @@ 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); + value_destroy (&value, width); lex_get (lexer); lex_match (lexer, ',');