X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fdictionary%2Fvalue-labels.c;h=9068290b7dda666495f24c1fe4499e7f7f28d9cf;hb=81579d9e9f994fb2908f50af41c3eb033d216e58;hp=e9c9b3f9f8fae8cec47eda0e1df86c66effb6740;hpb=42489b63e0b4bec2e20c2f55c9791234f7b41764;p=pspp-builds.git diff --git a/src/language/dictionary/value-labels.c b/src/language/dictionary/value-labels.c index e9c9b3f9..9068290b 100644 --- a/src/language/dictionary/value-labels.c +++ b/src/language/dictionary/value-labels.c @@ -1,97 +1,93 @@ -/* 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, 2010, 2011 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 "data/procedure.h" +#include "data/value-labels.h" +#include "data/variable.h" +#include "language/command.h" +#include "language/lexer/lexer.h" +#include "language/lexer/value-parser.h" +#include "language/lexer/variable-parser.h" +#include "libpspp/message.h" +#include "libpspp/str.h" + +#include "gl/xalloc.h" #include "gettext.h" #define _(msgid) gettext (msgid) /* Declarations. */ -static int do_value_labels (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 variable **vars, size_t var_cnt); +static int get_label (struct lexer *, struct variable **vars, size_t var_cnt); /* Stubs. */ int -cmd_value_labels (void) +cmd_value_labels (struct lexer *lexer, struct dataset *ds) { - return do_value_labels (1); + return do_value_labels (lexer, dataset_dict (ds), true); } int -cmd_add_value_labels (void) +cmd_add_value_labels (struct lexer *lexer, struct dataset *ds) { - return do_value_labels (0); + return do_value_labels (lexer, dataset_dict (ds), false); } /* Do it. */ static int -do_value_labels (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 ('/'); - - while (token != '.') + lex_match (lexer, T_SLASH); + + while (lex_token (lexer) != T_ENDCMD) { - parse_err = !parse_variables (dataset_dict (current_dataset), &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 (token != '/' && token != '.') - if (!get_label (vars, var_cnt)) + while (lex_token (lexer) != T_SLASH && lex_token (lexer) != T_ENDCMD) + if (!get_label (lexer, vars, var_cnt)) goto lossage; - if (token != '/') + if (lex_token (lexer) != T_SLASH) { - free (vars); - break; + free (vars); + break; } - lex_get (); + lex_get (lexer); free (vars); } @@ -99,96 +95,72 @@ do_value_labels (int erase) if (parse_err) return CMD_FAILURE; - return lex_end_of_command (); + return lex_end_of_command (lexer); lossage: free (vars); 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 (vp->type == ALPHA && vp->width > MAX_SHORT_STRING) - { - msg (SE, _("It is not possible to assign value labels to long " - "string variables such as %s."), vp->name); - 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 the specified labels to those variables. */ static int -get_label (struct variable **vars, size_t var_cnt) +get_label (struct lexer *lexer, struct variable **vars, size_t var_cnt) { /* Parse all the labels and add them to the variables. */ do { + enum { MAX_LABEL_LEN = 255 }; + int width = var_get_width (vars[0]); union value value; - char *label; + struct string label; size_t i; /* Set value. */ - if (vars[0]->type == ALPHA) - { - if (token != T_STRING) - { - lex_error (_("expecting string")); - return 0; - } - buf_copy_str_rpad (value.s, MAX_SHORT_STRING, ds_cstr (&tokstr)); - } - else - { - if (!lex_is_number ()) - { - lex_error (_("expecting integer")); - return 0; - } - if (!lex_is_integer ()) - msg (SW, _("Value label `%g' is not integer."), tokval); - value.f = tokval; - } - lex_get (); + value_init (&value, width); + if (!parse_value (lexer, &value, width)) + { + value_destroy (&value, width); + return 0; + } + lex_match (lexer, T_COMMA); /* Set label. */ - if (!lex_force_string ()) - return 0; - if (ds_length (&tokstr) > 60) + if (lex_token (lexer) != T_ID && !lex_force_string (lexer)) + { + value_destroy (&value, width); + return 0; + } + + ds_init_substring (&label, lex_tokss (lexer)); + + if (ds_length (&label) > MAX_LABEL_LEN) { - msg (SW, _("Truncating value label to 60 characters.")); - ds_truncate (&tokstr, 60); + msg (SW, _("Truncating value label to %d bytes."), MAX_LABEL_LEN); + ds_truncate (&label, MAX_LABEL_LEN); } - label = ds_cstr (&tokstr); for (i = 0; i < var_cnt; i++) - val_labs_replace (vars[i]->val_labs, value, label); + var_replace_value_label (vars[i], &value, ds_cstr (&label)); + + ds_destroy (&label); + value_destroy (&value, width); - lex_get (); + lex_get (lexer); + lex_match (lexer, T_COMMA); } - while (token != '/' && token != '.'); + while (lex_token (lexer) != T_SLASH && lex_token (lexer) != T_ENDCMD); return 1; }