* value-labels.c (get_label): Allow commas between values and

	labels and between value labels.  Fixes bug #18303.  Thanks to
	John Darrington for reporting this bug.

diff --git a/src/language/dictionary/ChangeLog b/src/language/dictionary/ChangeLog
index c0b714fc8f0bd890632d7d0088195a16c1abf7e7..a1d42607e290b47d497d68a6f3e4a224f708c9bb 100644 (file)
--- a/src/language/dictionary/ChangeLog
+++ b/src/language/dictionary/ChangeLog
@@ -1,3 +1,9 @@
+Thu Nov 30 22:06:21 2006  Ben Pfaff  <blp@gnu.org>
+
+       * value-labels.c (get_label): Allow commas between values and
+       labels and between value labels.  Fixes bug #18303.  Thanks to
+       John Darrington for reporting this bug.
+
 Sat Nov  4 16:04:19 2006  Ben Pfaff  <blp@gnu.org>
 
        * numeric.c: (cmd_string) Check that output format is valid.

diff --git a/src/language/dictionary/value-labels.c b/src/language/dictionary/value-labels.c
index 12948e28ee0328a33d50cb2d7016245374390834..09dee607cc977d0c63e450f273e9bf630d1ca40b 100644 (file)
--- a/src/language/dictionary/value-labels.c
+++ b/src/language/dictionary/value-labels.c
@@ -173,6 +173,7 @@ get_label (struct lexer *lexer, struct variable **vars, size_t var_cnt)
          value.f = lex_tokval (lexer);
        }
       lex_get (lexer);
+      lex_match (lexer, ',');
 
       /* Set label. */
       if (!lex_force_string (lexer))
@@ -192,6 +193,7 @@ get_label (struct lexer *lexer, struct variable **vars, size_t var_cnt)
       ds_destroy (&label);
 
       lex_get (lexer);
+      lex_match (lexer, ',');
     }
   while (lex_token (lexer) != '/' && lex_token (lexer) != '.');