X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fdata-io%2Flist.q;h=51623aac93d5abdf91664a7fe16c3164fc98f829;hb=84e4d346b557748b62d43158c1b50f655e357f9f;hp=d8df19cb17cdaa2f55fa6446591489deb5913d87;hpb=a4ae68f966bc574326d429119878e733069ced14;p=pspp

diff --git a/src/language/data-io/list.q b/src/language/data-io/list.q
index d8df19cb17..51623aac93 100644
--- a/src/language/data-io/list.q
+++ b/src/language/data-io/list.q
@@ -52,9 +52,9 @@
    list (lst_):
      *variables=varlist("PV_NO_SCRATCH");
      cases=:from n:first,"%s>0"/by n:step,"%s>0"/ *to n:last,"%s>0";
-     format=numbering:numbered/!unnumbered,
-            wrap:!wrap/single,
-            weight:weight/!noweight.
+     +format=numbering:numbered/!unnumbered,
+             wrap:!wrap/single,
+             weight:weight/!noweight.
 */
 /* (declarations) */
 /* (functions) */
@@ -118,7 +118,7 @@ write_line (struct outp_driver *d, const char *s)
   assert (d->cp_y + d->font_height <= d->length);
   text.font = OUTP_FIXED;
   text.justification = OUTP_LEFT;
-  ls_init (&text.string, s, strlen (s));
+  text.string = ss_cstr (s);
   text.x = d->cp_x;
   text.y = d->cp_y;
   text.h = text.v = INT_MAX;
@@ -134,7 +134,7 @@ cmd_list (void)
   struct variable casenum_var;
   bool ok;
 
-  if (!parse_list (&cmd))
+  if (!parse_list (&cmd, NULL))
     return CMD_FAILURE;
   
   /* Fill in defaults. */
@@ -269,7 +269,7 @@ write_all_headers (const struct ccase *c, void *aux UNUSED)
 	  fputs ("  </TR>\n", x->file);
 	}
       else
-	assert (0);
+	NOT_REACHED ();
     }
 }
 
@@ -387,7 +387,7 @@ clean_up (void)
 	  }
       }
     else
-      assert (0);
+      NOT_REACHED ();
   
   free (cmd.v_variables);
 }
@@ -411,7 +411,7 @@ write_varname (struct outp_driver *d, char *string, int indent)
 
   text.font = OUTP_FIXED;
   text.justification = OUTP_LEFT;
-  ls_init (&text.string, string, strlen (string));
+  text.string = ss_cstr (string);
   text.x = d->cp_x;
   text.y = d->cp_y;
   text.h = text.v = INT_MAX;
@@ -438,6 +438,7 @@ write_fallback_headers (struct outp_driver *d)
   while (index < cmd.n_variables)
     {
       struct outp_text text;
+      int leader_width;
 
       /* Ensure that there is enough room for a line of text. */
       if (d->cp_y + d->font_height > d->length)
@@ -447,12 +448,13 @@ write_fallback_headers (struct outp_driver *d)
       sprintf (leader, "%s %d:", Line, ++line_number);
       text.font = OUTP_FIXED;
       text.justification = OUTP_LEFT;
-      ls_init (&text.string, leader, strlen (leader));
+      text.string = ss_cstr (leader);
       text.x = 0;
       text.y = d->cp_y;
       text.h = text.v = INT_MAX;
       d->class->text_draw (d, &text);
-      d->class->text_metrics (d, &text, &d->cp_x, NULL);
+      d->class->text_metrics (d, &text, &leader_width, NULL);
+      d->cp_x = leader_width;
 
       goto entry;
       do
@@ -473,9 +475,10 @@ write_fallback_headers (struct outp_driver *d)
 	  }
 	  
 	  {
-	    char varname[10];
-	    sprintf (varname, " %s", cmd.v_variables[index]->name);
-	    write_varname (d, varname, text.h);
+	    char varname[LONG_NAME_LEN + 2];
+	    snprintf (varname, sizeof varname,
+                      " %s", cmd.v_variables[index]->name);
+	    write_varname (d, varname, leader_width);
 	  }
 	}
       while (++index < cmd.n_variables);
@@ -601,7 +604,7 @@ determine_layout (void)
       d->cp_y += d->font_height;
     }
 
-  ds_init(&line_buffer, largest_page_width + 2);
+  ds_init_empty (&line_buffer);
 }
 
 /* Writes case C to output. */
@@ -624,7 +627,7 @@ list_cases (const struct ccase *c, void *aux UNUSED)
 
 	if (!prc->header_rows)
 	  {
-	    ds_printf(&line_buffer, "%8s: ", cmd.v_variables[0]->name);
+	    ds_put_format(&line_buffer, "%8s: ", cmd.v_variables[0]->name);
 	  }
 	
       
@@ -647,34 +650,34 @@ list_cases (const struct ccase *c, void *aux UNUSED)
 		    write_header (d);
 		  }
 	      
-		write_line (d, ds_c_str(&line_buffer));
+		write_line (d, ds_cstr (&line_buffer));
 		ds_clear(&line_buffer);
 
 		if (!prc->header_rows)
 		  {
-		    ds_printf (&line_buffer, "%8s: ", v->name);
+		    ds_put_format (&line_buffer, "%8s: ", v->name);
 		  }
 	      }
 
 	    if (width > v->print.w)
 	      {
-		ds_putc_multiple(&line_buffer, ' ', width - v->print.w);
+		ds_put_char_multiple(&line_buffer, ' ', width - v->print.w);
 	      }
 
             if ((formats[v->print.type].cat & FCAT_STRING) || v->fv != -1)
 	      {
-                data_out (ds_append_uninit(&line_buffer, v->print.w),
+                data_out (ds_put_uninit(&line_buffer, v->print.w),
 			  &v->print, case_data (c, v->fv));
 	      }
             else 
               {
                 union value case_idx_value;
                 case_idx_value.f = case_idx;
-                data_out (ds_append_uninit(&line_buffer,v->print.w), 
+                data_out (ds_put_uninit(&line_buffer,v->print.w), 
 			  &v->print,   &case_idx_value); 
               }
 
-	    ds_putc(&line_buffer, ' ');
+	    ds_put_char(&line_buffer, ' ');
 	  }
       
 	if (!n_lines_remaining (d))
@@ -683,7 +686,7 @@ list_cases (const struct ccase *c, void *aux UNUSED)
 	    write_header (d);
 	  }
 	      
-	write_line (d, ds_c_str(&line_buffer));
+	write_line (d, ds_cstr (&line_buffer));
 	ds_clear(&line_buffer);
       }
     else if (d->class == &html_class)
@@ -697,7 +700,6 @@ list_cases (const struct ccase *c, void *aux UNUSED)
 	  {
 	    struct variable *v = cmd.v_variables[column];
 	    char buf[256];
-            struct fixed_string s;
 	    
             if ((formats[v->print.type].cat & FCAT_STRING) || v->fv != -1)
 	      data_out (buf, &v->print, case_data (c, v->fv));
@@ -708,16 +710,15 @@ list_cases (const struct ccase *c, void *aux UNUSED)
                 data_out (buf, &v->print, &case_idx_value); 
               }
 
-            ls_init (&s, buf, v->print.w);
             fputs ("    <TD>", x->file);
-            html_put_cell_contents (d, TAB_FIX, &s);
+            html_put_cell_contents (d, TAB_FIX, ss_buffer (buf, v->print.w));
             fputs ("</TD>\n", x->file);
 	  }
 	  
 	fputs ("  </TR>\n", x->file);
       }
     else
-      assert (0);
+      NOT_REACHED ();
 
   return true;
 }