X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fdictionary%2Fvalue-labels.c;h=0fb847165255cfe06ce0c60d88fed6fc7c12b953;hb=339f1956cc727eda788638644ef93ab7852b31cd;hp=226518f261c02c91983845f420e3e2b72ca5ba34;hpb=6d53d2b45f5385271dd21e8df1b5ac23d20be9fb;p=pspp diff --git a/src/language/dictionary/value-labels.c b/src/language/dictionary/value-labels.c index 226518f261..0fb8471652 100644 --- a/src/language/dictionary/value-labels.c +++ b/src/language/dictionary/value-labels.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 1997-9, 2000, 2009 Free Software Foundation, Inc. + 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 @@ -19,17 +19,19 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "data/dataset.h" +#include "data/dictionary.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/i18n.h" +#include "libpspp/message.h" +#include "libpspp/str.h" -#include "xalloc.h" +#include "gl/xalloc.h" #include "gettext.h" #define _(msgid) gettext (msgid) @@ -38,8 +40,9 @@ 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); +static void erase_labels (struct variable **vars, size_t n_vars); +static int get_label (struct lexer *, struct variable **vars, size_t n_vars, + const char *dict_encoding); /* Stubs. */ @@ -61,27 +64,27 @@ static int do_value_labels (struct lexer *lexer, const struct dictionary *dict, bool erase) { struct variable **vars; /* Variable list. */ - size_t var_cnt; /* Number of variables. */ + size_t n_vars; /* Number of variables. */ int parse_err=0; /* true if error parsing variables */ - lex_match (lexer, '/'); + lex_match (lexer, T_SLASH); - while (lex_token (lexer) != '.') + while (lex_token (lexer) != T_ENDCMD) { - parse_err = !parse_variables (lexer, dict, &vars, &var_cnt, + parse_err = !parse_variables (lexer, dict, &vars, &n_vars, PV_SAME_WIDTH); - if (var_cnt < 1) + if (n_vars < 1) { free(vars); return CMD_FAILURE; } if (erase) - erase_labels (vars, var_cnt); - while (lex_token (lexer) != '/' && lex_token (lexer) != '.') - if (!get_label (lexer, vars, var_cnt)) + erase_labels (vars, n_vars); + while (lex_token (lexer) != T_SLASH && lex_token (lexer) != T_ENDCMD) + if (!get_label (lexer, vars, n_vars, dict_get_encoding (dict))) goto lossage; - if (lex_token (lexer) != '/') + if (lex_token (lexer) != T_SLASH) { free (vars); break; @@ -92,48 +95,46 @@ do_value_labels (struct lexer *lexer, const struct dictionary *dict, bool erase) free (vars); } - if (parse_err) - return CMD_FAILURE; - - return lex_end_of_command (lexer); + return parse_err ? CMD_FAILURE : CMD_SUCCESS; lossage: free (vars); return CMD_FAILURE; } -/* Erases all the labels for the VAR_CNT variables in VARS. */ +/* Erases all the labels for the N_VARS variables in VARS. */ static void -erase_labels (struct variable **vars, size_t var_cnt) +erase_labels (struct variable **vars, size_t n_vars) { - size_t i; - /* Erase old value labels if desired. */ - for (i = 0; i < var_cnt; i++) + for (size_t i = 0; i < n_vars; i++) var_clear_value_labels (vars[i]); } -/* Parse all the labels for the VAR_CNT variables in VARS and add +/* Parse all the labels for the N_VARS variables in VARS and add the specified labels to those variables. */ static int -get_label (struct lexer *lexer, struct variable **vars, size_t var_cnt) +get_label (struct lexer *lexer, struct variable **vars, size_t n_vars, + const char *dict_encoding) { /* 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; struct string label; + size_t trunc_len; size_t i; /* Set value. */ value_init (&value, width); - if (!parse_value (lexer, &value, width)) + if (!parse_value (lexer, &value, vars[0])) { value_destroy (&value, width); return 0; } - lex_match (lexer, ','); + lex_match (lexer, T_COMMA); /* Set label. */ if (lex_token (lexer) != T_ID && !lex_force_string (lexer)) @@ -142,24 +143,26 @@ get_label (struct lexer *lexer, struct variable **vars, size_t var_cnt) return 0; } - ds_init_string (&label, lex_tokstr (lexer)); + ds_init_substring (&label, lex_tokss (lexer)); - if (ds_length (&label) > 60) + trunc_len = utf8_encoding_trunc_len (ds_cstr (&label), dict_encoding, + MAX_LABEL_LEN); + if (ds_length (&label) > trunc_len) { - msg (SW, _("Truncating value label to 60 characters.")); - ds_truncate (&label, 60); + msg (SW, _("Truncating value label to %d bytes."), MAX_LABEL_LEN); + ds_truncate (&label, trunc_len); } - for (i = 0; i < var_cnt; i++) + for (i = 0; i < n_vars; i++) var_replace_value_label (vars[i], &value, ds_cstr (&label)); ds_destroy (&label); value_destroy (&value, width); lex_get (lexer); - lex_match (lexer, ','); + lex_match (lexer, T_COMMA); } - while (lex_token (lexer) != '/' && lex_token (lexer) != '.'); + while (lex_token (lexer) != T_SLASH && lex_token (lexer) != T_ENDCMD); return 1; }