[Pspp-cvs] pspp/src/language/dictionary ChangeLog value-la...

[Ben Pfaff]

CVSROOT:        /cvsroot/pspp
Module name:    pspp
Changes by:     Ben Pfaff <blp> 06/12/01 06:06:52

Modified files:
        src/language/dictionary: ChangeLog value-labels.c 

Log message:
                * 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.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/dictionary/ChangeLog?cvsroot=pspp&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/dictionary/value-labels.c?cvsroot=pspp&r1=1.11&r2=1.12

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/dictionary/ChangeLog,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- ChangeLog   5 Nov 2006 05:20:53 -0000       1.5
+++ ChangeLog   1 Dec 2006 06:06:52 -0000       1.6
@@ -1,3 +1,9 @@
+Thu Nov 30 22:06:21 2006  Ben Pfaff  <address@hidden>
+
+       * 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  <address@hidden>
 
        * numeric.c: (cmd_string) Check that output format is valid.

Index: value-labels.c
===================================================================
RCS file: /cvsroot/pspp/pspp/src/language/dictionary/value-labels.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- value-labels.c      1 Dec 2006 06:03:58 -0000       1.11
+++ value-labels.c      1 Dec 2006 06:06:52 -0000       1.12
@@ -173,6 +173,7 @@
          value.f = lex_tokval (lexer);
        }
       lex_get (lexer);
+      lex_match (lexer, ',');
 
       /* Set label. */
       if (!lex_force_string (lexer))
@@ -192,6 +193,7 @@
       ds_destroy (&label);
 
       lex_get (lexer);
+      lex_match (lexer, ',');
     }
   while (lex_token (lexer) != '/' && lex_token (lexer) != '.');