From 327bc8fc032dff94c6172815d01ed80d3550472f Mon Sep 17 00:00:00 2001 From: Ben Pfaff Date: Fri, 1 Dec 2006 06:06:52 +0000 Subject: [PATCH] * 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. --- src/language/dictionary/ChangeLog | 6 ++++++ src/language/dictionary/value-labels.c | 2 ++ 2 files changed, 8 insertions(+) diff --git a/src/language/dictionary/ChangeLog b/src/language/dictionary/ChangeLog index c0b714fc..a1d42607 100644 --- a/src/language/dictionary/ChangeLog +++ b/src/language/dictionary/ChangeLog @@ -1,3 +1,9 @@ +Thu Nov 30 22:06:21 2006 Ben Pfaff + + * 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 * 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 12948e28..09dee607 100644 --- 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) != '.'); -- 2.30.2