From: John Darrington Date: Wed, 15 Oct 2008 02:49:58 +0000 (+0800) Subject: Allow value labels for non integer values. X-Git-Tag: v0.7.1~50^2~21^2~5 X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?p=pspp-builds.git;a=commitdiff_plain;h=6f48190d3435800eec4984e927757242dafaef45 Allow value labels for non integer values. --- diff --git a/src/language/dictionary/value-labels.c b/src/language/dictionary/value-labels.c index 4b7c0396..39f544ec 100644 --- a/src/language/dictionary/value-labels.c +++ b/src/language/dictionary/value-labels.c @@ -163,11 +163,9 @@ 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); diff --git a/tests/expressions/valuelabel.sh b/tests/expressions/valuelabel.sh index 1c29a7a5..cb0f5ba3 100755 --- a/tests/expressions/valuelabel.sh +++ b/tests/expressions/valuelabel.sh @@ -60,6 +60,7 @@ cat > $TEMPDIR/valuelabel.stat <