From dd714f7d6e14e5fcad0014170201d23d116d4246 Mon Sep 17 00:00:00 2001
From: Ben Pfaff <blp@cs.stanford.edu>
Date: Sat, 7 Aug 2010 19:34:24 -0700
Subject: [PATCH] DATA LIST: Fix output column reporting for FREE and LIST
 formats.

Also, add tests to prevent inadvertent regressions.
---
 src/language/data-io/data-parser.c  |  7 ++++---
 tests/language/data-io/data-list.at | 24 ++++++++++++++++--------
 2 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/src/language/data-io/data-parser.c b/src/language/data-io/data-parser.c
index eb578e27..1e68c904 100644
--- a/src/language/data-io/data-parser.c
+++ b/src/language/data-io/data-parser.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2007, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009, 2010 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -471,7 +471,7 @@ cut_field (const struct data_parser *parser, struct dfm_reader *reader,
             }
           *field = ds_ss (tmp);
         }
-      *last_column = dfm_column_start (reader);
+      *last_column = *first_column + (ss_length (line) - ss_length (p));
 
       /* Skip trailing soft separator and a single hard separator
          if present. */
@@ -484,7 +484,8 @@ cut_field (const struct data_parser *parser, struct dfm_reader *reader,
     {
       /* Regular field. */
       ss_get_chars (&p, ss_cspan (p, ds_ss (&parser->any_sep)), field);
-      *last_column = dfm_column_start (reader);
+      *last_column = *first_column + ss_length (*field);
+
       if (!ss_ltrim (&p, parser->soft_seps) || ss_is_empty (p)
           || ss_find_char (parser->hard_seps, p.string[0]) != SIZE_MAX)
         {
diff --git a/tests/language/data-io/data-list.at b/tests/language/data-io/data-list.at
index 746ea774..58970884 100644
--- a/tests/language/data-io/data-list.at
+++ b/tests/language/data-io/data-list.at
@@ -4,7 +4,7 @@ AT_SETUP([DATA LIST LIST with explicit delimiters])
 AT_DATA([data-list.pspp], [dnl
 data list list ('|','X') /A B C D.
 begin data.
-1|23X45|2.03
+1|23X45|2.03x
 2X22|34|23|
 3|34|34X34
 end data.
@@ -19,9 +19,11 @@ B,F8.0
 C,F8.0
 D,F8.0
 
+"data-list.pspp:3: warning: (columns 9-13, F field) Number followed by garbage."
+
 Table: Data List
 A,B,C,D
-1.00,23.00,45.00,2.03
+1.00,23.00,45.00,.  @&t@
 2.00,22.00,34.00,23.00
 3.00,34.00,34.00,34.00
 ])
@@ -32,7 +34,7 @@ AT_DATA([data-list.pspp], [dnl
 data list free skip=1/A B C D.
 begin data.
 # This record is ignored.
-,1,2,3
+,1,2,x
 ,4,,5
 6
 7,
@@ -48,9 +50,11 @@ end data.
 list.
 ])
 AT_CHECK([pspp -O format=csv data-list.pspp], [0], [dnl
+"data-list.pspp:4: warning: (column 6, F field) Field contents are not numeric."
+
 Table: Data List
 A,B,C,D
-.  ,1.00,2.00,3.00
+.  ,1.00,2.00,.  @&t@
 .  ,4.00,.  ,5.00
 6.00,7.00,8.00,9.00
 .00,1.00,.  ,.  @&t@
@@ -115,10 +119,10 @@ data list fixed notable
 begin data.
 07-22-2007
 10-06-2007
-321
+x
 07-14-1789
 08-26-1789
-4
+xy
 01-01-1972
 12-31-1999
 682
@@ -126,10 +130,14 @@ end data.
 list.
 ])
 AT_CHECK([pspp -O format=csv data-list.pspp], [0], [dnl
+"data-list.pspp:8: warning: (columns 1-3, F field) Field contents are not numeric."
+
+"data-list.pspp:11: warning: (columns 1-3, F field) Field contents are not numeric."
+
 Table: Data List
 start,end,count
-07/22/2007,10/06/2007,321
-07/14/1789,08/26/1789,4
+07/22/2007,10/06/2007,.
+07/14/1789,08/26/1789,.
 01/01/1972,12/31/1999,682
 ])
 AT_CLEANUP
-- 
2.30.2