From: John Darrington <john@darrington.wattle.id.au>
Date: Wed, 15 Oct 2008 02:49:58 +0000 (+0800)
Subject: Allow value labels for non integer values.
X-Git-Tag: sav-api~870^2~21^2~5
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6f48190d3435800eec4984e927757242dafaef45;p=pspp

Allow value labels for non integer values.
---

diff --git a/src/language/dictionary/value-labels.c b/src/language/dictionary/value-labels.c
index 4b7c039617..39f544ec4b 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 1c29a7a523..cb0f5ba3a0 100755
--- a/tests/expressions/valuelabel.sh
+++ b/tests/expressions/valuelabel.sh
@@ -60,6 +60,7 @@ cat > $TEMPDIR/valuelabel.stat <<EOF
 DATA LIST notable /n 1 s 2(a).
 VALUE LABELS /n 0 'Very dissatisfied'
                 1 'Dissatisfied'
+		1.5 'Slightly Peeved'
                 2 'Neutral'
                 3 'Satisfied'
                 4 'Very satisfied'.
@@ -82,6 +83,7 @@ BEGIN DATA.
 5f
 6g
 END DATA.
+
 EOF
 if [ $? -ne 0 ] ; then no_result ; fi