Fully implement arbitrary delimiters on DATA LIST, extending the half

[pspp-builds.git] / src / print.c

diff --git a/src/print.c b/src/print.c
index 7f93f13f717296d31d11530a05011f7ba1030002..b3098d673a1bc5b6ac8dacf2df493156fb47a312 100644 (file)
--- a/src/print.c
+++ b/src/print.c
@@ -20,7 +20,7 @@
 /* FIXME: seems like a lot of code duplication with data-list.c. */
 
 #include <config.h>
-#include <assert.h>
+#include "error.h"
 #include <stdlib.h>
 #include "alloc.h"
 #include "command.h"
@@ -338,7 +338,7 @@ parse_string_argument (void)
 {
   fx.spec.type = PRT_CONST;
   fx.spec.fc = fx.sc - 1;
-  fx.spec.u.c = xstrdup (ds_value (&tokstr));
+  fx.spec.u.c = xstrdup (ds_c_str (&tokstr));
   lex_get ();
 
   /* Parse the included column range. */
@@ -878,6 +878,7 @@ alloc_line (void)
        case PRT_ERROR:
         default:
          assert (0);
+          abort ();
        }
       if (pot_w > w)
        w = pot_w;
@@ -1030,7 +1031,7 @@ cmd_print_space (void)
 
   if (token != '.')
     {
-      e = expr_parse (PXP_NUMERIC);
+      e = expr_parse (EXPR_NUMERIC);
       if (token != '.')
        {
          expr_free (e);