X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fdata-io%2Flist.q;h=71238e8eee3984089b2ac02d443b874d0ea54aec;hb=3816248a008a4af75aac6319d0c9929cb7ff679e;hp=b099a270b49fc3e8d4c7a2f13b62ea68d52ca920;hpb=3a61659a8fc11c51ad5af02b20f5613dcde50382;p=pspp-builds.git

diff --git a/src/language/data-io/list.q b/src/language/data-io/list.q
index b099a270..71238e8e 100644
--- a/src/language/data-io/list.q
+++ b/src/language/data-io/list.q
@@ -26,6 +26,7 @@
 #include "size_max.h"
 #include <data/case.h>
 #include <data/dictionary.h>
+#include <data/data-out.h>
 #include <data/format.h>
 #include <data/procedure.h>
 #include <data/variable.h>
@@ -129,12 +130,12 @@ write_line (struct outp_driver *d, const char *s)
     
 /* Parses and executes the LIST procedure. */
 int
-cmd_list (struct dataset *ds)
+cmd_list (struct lexer *lexer, struct dataset *ds)
 {
   struct variable casenum_var;
   bool ok;
 
-  if (!parse_list (ds, &cmd, NULL))
+  if (!parse_list (lexer, ds, &cmd, NULL))
     return CMD_FAILURE;
   
   /* Fill in defaults. */
@@ -666,15 +667,15 @@ list_cases (const struct ccase *c, void *aux UNUSED, const struct dataset *ds UN
 
             if (fmt_is_string (v->print.type) || v->fv != -1)
 	      {
-                data_out (ds_put_uninit(&line_buffer, v->print.w),
-			  &v->print, case_data (c, v->fv));
+                data_out (case_data (c, v->fv), &v->print,
+                          ds_put_uninit (&line_buffer, v->print.w));
 	      }
             else 
               {
                 union value case_idx_value;
                 case_idx_value.f = case_idx;
-                data_out (ds_put_uninit(&line_buffer,v->print.w), 
-			  &v->print,   &case_idx_value); 
+                data_out (&case_idx_value, &v->print,
+                          ds_put_uninit (&line_buffer,v->print.w)); 
               }
 
 	    ds_put_char(&line_buffer, ' ');
@@ -702,12 +703,12 @@ list_cases (const struct ccase *c, void *aux UNUSED, const struct dataset *ds UN
 	    char buf[256];
 	    
             if (fmt_is_string (v->print.type) || v->fv != -1)
-	      data_out (buf, &v->print, case_data (c, v->fv));
+	      data_out (case_data (c, v->fv), &v->print, buf);
             else 
               {
                 union value case_idx_value;
                 case_idx_value.f = case_idx;
-                data_out (buf, &v->print, &case_idx_value); 
+                data_out (&case_idx_value, &v->print, buf);
               }
 
             fputs ("    <TD>", x->file);