Fully implement arbitrary delimiters on DATA LIST, extending the half

[pspp-builds.git] / src / data-in.c

diff --git a/src/data-in.c b/src/data-in.c
index 04c035d4f66fe2eb57f80d0e7ad7e56abb9d8243..c082516d664efe45f39f6eaf31a1b439c0cdfb3b 100644 (file)
--- a/src/data-in.c
+++ b/src/data-in.c
@@ -18,14 +18,14 @@
    02111-1307, USA. */
 
 #include <config.h>
-#include <assert.h>
+#include "data-in.h"
+#include "error.h"
 #include <math.h>
 #include <ctype.h>
 #include <stdarg.h>
 #include <stddef.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include "data-in.h"
 #include "error.h"
 #include "getline.h"
 #include "julcal/julcal.h"
@@ -36,15 +36,13 @@
 #include "str.h"
 #include "var.h"
 \f
-#undef DEBUGGING
-/*#define DEBUGGING 1 */
 #include "debug-print.h"
 
 \f
 /* Specialized error routine. */
 
 static void dls_error (const struct data_in *, const char *format, ...)
-     __attribute__ ((format (printf, 2, 3)));
+     PRINTF_FORMAT (2, 3);
 
 static void
 dls_error (const struct data_in *i, const char *format, ...)
@@ -66,9 +64,9 @@ dls_error (const struct data_in *i, const char *format, ...)
     struct error e;
     struct string title;
 
-    ds_init (NULL, &title, 64);
+    ds_init (&title, 64);
     if (!getl_reading_script)
-      ds_concat (&title, _("data-file error: "));
+      ds_puts (&title, _("data-file error: "));
     if (i->f1 == i->f2)
       ds_printf (&title, _("(column %d"), i->f1);
     else
@@ -77,7 +75,7 @@ dls_error (const struct data_in *i, const char *format, ...)
     
     e.class = DE;
     err_location (&e.where);
-    e.title = ds_value (&title);
+    e.title = ds_c_str (&title);
     e.text = buf;
 
     err_vmsg (&e);
@@ -142,16 +140,18 @@ parse_numeric (struct data_in *i)
       if (*i->s == '-' || *i->s == '+')
        i->s++;
     }
+  else
+    sign = 1;
   
   if (type != FMT_DOT)
     {
-      decimal = set_decimal;
-      grouping = set_grouping;
+      decimal = get_decimal();
+      grouping = get_grouping();
     }
   else
     {
-      decimal = set_grouping;
-      grouping = set_decimal;
+      decimal = get_grouping();
+      grouping = get_decimal();
     }
 
   i->v->f = SYSMIS;
@@ -288,6 +288,7 @@ parse_N (struct data_in *i)
 {
   const unsigned char *cp;
 
+  i->v->f = 0;
   for (cp = i->s; cp < i->e; cp++)
     {
       if (!isdigit (*cp))
@@ -382,9 +383,10 @@ parse_Z (struct data_in *i)
 
     if (!warned)
       {
-       msg (MW, _("Quality of zoned decimal (Z) input format code is "
-                  "suspect.  Check your results three times, report bugs "
-                  "to author."));
+       msg (MW, 
+            _("Quality of zoned decimal (Z) input format code is "
+              "suspect.  Check your results three times. Report bugs "
+               "to %s."),PACKAGE_BUGREPORT);
        warned = 1;
       }
   }
@@ -451,14 +453,13 @@ parse_IB (struct data_in *i)
 
   /* We want the data to be in big-endian format.  If this is a
      little-endian machine, reverse the byte order. */
-  if (endian == LITTLE)
-    {
-      memcpy (buf, i->s, i->e - i->s);
-      mm_reverse (buf, i->e - i->s);
-      p = buf;
-    }
-  else
-    p = i->s;
+#ifdef WORDS_BIGENDIAN
+  p = i->s;
+#else
+  memcpy (buf, i->s, i->e - i->s);
+  mm_reverse (buf, i->e - i->s);
+  p = buf;
+#endif
 
   /* If the value is negative, we need to logical-NOT each value
      before adding it. */
@@ -492,12 +493,13 @@ parse_PIB (struct data_in *i)
   int j;
 
   i->v->f = 0.0;
-  if (endian == BIG)
-    for (j = 0; j < i->e - i->s; j++)
-      i->v->f = i->v->f * 256.0 + i->s[j];
-  else
-    for (j = i->e - i->s - 1; j >= 0; j--)
-      i->v->f = i->v->f * 256.0 + i->s[j];
+#if WORDS_BIGENDIAN
+  for (j = 0; j < i->e - i->s; j++)
+    i->v->f = i->v->f * 256.0 + i->s[j];
+#else
+  for (j = i->e - i->s - 1; j >= 0; j--)
+    i->v->f = i->v->f * 256.0 + i->s[j];
+#endif
 
   if (i->format.d)
     i->v->f /= pow (10.0, i->format.d);
@@ -574,11 +576,6 @@ parse_A (struct data_in *i)
       memset (i->v->s + len, ' ', i->format.w - len);
     }
 
-#if __CHECKER__
-  memset (i->v->s + i->format.w, '%',
-         REM_RND_UP (i->format.w, MAX_SHORT_STRING));
-#endif
-  
   return 1;
 }
 
@@ -613,11 +610,6 @@ parse_AHEX (struct data_in *i)
     memset (i->v->s + (i->e - i->s) / 2, ' ', (i->format.w - (i->e - i->s)) / 2);
   }
   
-#if __CHECKER__
-  memset (i->v->s + i->format.w / 2, '%',
-         REM_RND_UP (i->format.w / 2, MAX_SHORT_STRING));
-#endif
-
   return 1;
 }
 \f
@@ -1497,15 +1489,9 @@ default_result (struct data_in *i)
 
   /* Default to SYSMIS or blanks. */
   if (fmt->cat & FCAT_STRING)
-    {
-#if __CHECKER__
-      memset (i->v->s, ' ', ROUND_UP (i->format.w, MAX_SHORT_STRING));
-#else
-      memset (i->v->s, ' ', i->format.w);
-#endif
-    }
+    memset (i->v->s, ' ', i->format.w);
   else
-    i->v->f = set_blanks;
+    i->v->f = get_blanks();
 }
 
 int
@@ -1543,7 +1529,7 @@ data_in (struct data_in *i)
 
          if (++cp == i->e)
            {
-             i->v->f = set_blanks;
+             i->v->f = get_blanks();
              return 1;
            }
        }