X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Flist.q;h=56f45342be4005cf1c02d05e83c8fd7a480de558;hb=97d6c6f6b1922621ca013668eba9a9a9f71d60fe;hp=dbdacb573c3a6ad856c3a8062a9370094687d6ae;hpb=6bc566408707e018674d1776d835c78368b6b5a3;p=pspp

diff --git a/src/list.q b/src/list.q
index dbdacb573c..56f45342be 100644
--- a/src/list.q
+++ b/src/list.q
@@ -18,11 +18,12 @@
    02111-1307, USA. */
 
 #include <config.h>
-#include <assert.h>
+#include "error.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include "alloc.h"
 #include "command.h"
+#include "devind.h"
 #include "lexer.h"
 #include "error.h"
 #include "magic.h"
@@ -30,6 +31,7 @@
 #include "htmlP.h"
 #include "output.h"
 #include "som.h"
+#include "tab.h"
 #include "var.h"
 #include "vfm.h"
 #include "format.h"
@@ -75,11 +77,11 @@ static int n_chars_width (struct outp_driver *d);
 static void write_line (struct outp_driver *d, char *s);
 
 /* Other functions. */
-static int list_cases (struct ccase *);
+static int list_cases (struct ccase *, void *);
 static void determine_layout (void);
 static void clean_up (void);
 static void write_header (struct outp_driver *);
-static void write_all_headers (void);
+static void write_all_headers (void *);
 
 /* Returns the number of text lines that can fit on the remainder of
    the page. */
@@ -123,7 +125,6 @@ cmd_list (void)
 {
   struct variable casenum_var;
 
-  lex_match_id ("LIST");
   if (!parse_list (&cmd))
     return CMD_FAILURE;
   
@@ -225,7 +226,7 @@ cmd_list (void)
   determine_layout ();
 
   case_num = 0;
-  procedure (write_all_headers, list_cases, NULL);
+  procedure_with_splits (write_all_headers, list_cases, NULL, NULL);
   free (line_buf);
 
   clean_up ();
@@ -236,7 +237,7 @@ cmd_list (void)
 /* Writes headers to all devices.  This is done at the beginning of
    each SPLIT FILE group. */
 static void
-write_all_headers (void)
+write_all_headers (void *aux UNUSED)
 {
   struct outp_driver *d;
 
@@ -251,7 +252,7 @@ write_all_headers (void)
 	{
 	  struct html_driver_ext *x = d->ext;
   
-	  assert (d->driver_open && d->page_open);
+	  assert (d->driver_open);
 	  if (x->sequence_no == 0 && !d->class->open_page (d))
 	    {
 	      msg (ME, _("Cannot open first page on HTML device %s."),
@@ -271,6 +272,10 @@ write_all_headers (void)
 
 	  fputs ("  <TR>\n", x->file.file);
 	}
+      else if (d->class == &devind_class) 
+        {
+          /* FIXME */
+        }
       else
 	assert (0);
     }
@@ -389,6 +394,10 @@ clean_up (void)
 	    fputs ("</TABLE>\n", x->file.file);
 	  }
       }
+    else if (d->class == &devind_class) 
+      {
+        /* FIXME */
+      }
     else
       assert (0);
   
@@ -520,6 +529,12 @@ determine_layout (void)
 
       if (d->class == &html_class)
 	continue;
+      else if (d->class == &devind_class) 
+        {
+          /* FIXME */
+          tab_output_text (TAT_NONE, "(devind not supported on LIST yet)");
+          continue;
+        }
       
       assert (d->class->special == 0);
 
@@ -602,7 +617,7 @@ determine_layout (void)
 }
 
 static int
-list_cases (struct ccase *c)
+list_cases (struct ccase *c, void *aux UNUSED)
 {
   struct outp_driver *d;
   
@@ -653,19 +668,15 @@ list_cases (struct ccase *c)
 		memset(&line_buf[x], ' ', width - v->print.w);
 		x += width - v->print.w;
 	      }
-	  
-	    {
-	      union value value;
-	    
-	      if (formats[v->print.type].cat & FCAT_STRING)
-		value.c = c->data[v->fv].s;
-	      else if (v->fv == -1)
-		value.f = case_num;
-	      else
-		value.f = c->data[v->fv].f;
-		
-	      data_out (&line_buf[x], &v->print, &value);
-	    }
+
+            if ((formats[v->print.type].cat & FCAT_STRING) || v->fv != -1)
+	      data_out (&line_buf[x], &v->print, &c->data[v->fv]);
+            else 
+              {
+                union value case_num_value;
+                case_num_value.f = case_num;
+                data_out (&line_buf[x], &v->print, &case_num_value); 
+              }
 	    x += v->print.w;
 	  
 	    line_buf[x++] = ' ';
@@ -690,17 +701,16 @@ list_cases (struct ccase *c)
 	for (column = 0; column < cmd.n_variables; column++)
 	  {
 	    struct variable *v = cmd.v_variables[column];
-	    union value value;
 	    char buf[41];
 	    
-	    if (formats[v->print.type].cat & FCAT_STRING)
-	      value.c = c->data[v->fv].s;
-	    else if (v->fv == -1)
-	      value.f = case_num;
-	    else
-	      value.f = c->data[v->fv].f;
-		
-	    data_out (buf, &v->print, &value);
+            if ((formats[v->print.type].cat & FCAT_STRING) || v->fv != -1)
+	      data_out (buf, &v->print, &c->data[v->fv]);
+            else 
+              {
+                union value case_num_value;
+                case_num_value.f = case_num;
+                data_out (buf, &v->print, &case_num_value); 
+              }
 	    buf[v->print.w] = 0;
 
 	    fprintf (x->file.file, "    <TD ALIGN=RIGHT>%s</TD>\n",
@@ -709,6 +719,10 @@ list_cases (struct ccase *c)
 	  
 	fputs ("  </TR>\n", x->file.file);
       }
+    else if (d->class == &devind_class) 
+      {
+        /* FIXME */
+      }
     else
       assert (0);