X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Flanguage%2Fdictionary%2Fvalue-labels.c;h=8c312ab8cee23ebec567ac3e1a8189285aa80e47;hb=refs%2Fbuilds%2F190%2Fpspp;hp=17ef5f1ee488b795c49c1b92af800e33789e86b4;hpb=f5c108becd49d78f4898cab11352291f5689d24e;p=pspp
diff --git a/src/language/dictionary/value-labels.c b/src/language/dictionary/value-labels.c
index 17ef5f1ee4..8c312ab8ce 100644
--- a/src/language/dictionary/value-labels.c
+++ b/src/language/dictionary/value-labels.c
@@ -1,20 +1,18 @@
-/* PSPP - computes sample statistics.
- Copyright (C) 1997-9, 2000 Free Software Foundation, Inc.
+/* PSPP - a program for statistical analysis.
+ Copyright (C) 1997-9, 2000, 2009, 2010 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
@@ -26,12 +24,13 @@
#include
#include
#include
+#include
#include
-#include
-#include
#include
#include
+#include "xalloc.h"
+
#include "gettext.h"
#define _(msgid) gettext (msgid)
@@ -39,7 +38,6 @@
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);
@@ -66,26 +64,24 @@ do_value_labels (struct lexer *lexer, const struct dictionary *dict, bool erase)
size_t var_cnt; /* 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,
- PV_SAME_TYPE) ;
+ 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) != '.')
+ while (lex_token (lexer) != T_SLASH && lex_token (lexer) != T_ENDCMD)
if (!get_label (lexer, vars, var_cnt))
goto lossage;
- if (lex_token (lexer) != '/')
+ if (lex_token (lexer) != T_SLASH)
{
free (vars);
break;
@@ -106,27 +102,6 @@ do_value_labels (struct lexer *lexer, const struct dictionary *dict, bool 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++)
- {
- const 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)
@@ -146,55 +121,46 @@ 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;
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);
- lex_match (lexer, ',');
+ 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 (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));
+ ds_init_substring (&label, lex_tokss (lexer));
- if (ds_length (&label) > 60)
+ if (ds_length (&label) > MAX_LABEL_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, MAX_LABEL_LEN);
}
for (i = 0; i < var_cnt; 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;
}