X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fdata-io%2Flist.q;h=54b09c34f7a8548fbbdc7f76805ae7da16f2dbe1;hb=42489b63e0b4bec2e20c2f55c9791234f7b41764;hp=dd9a8ae1cf329b089d40c8a0994753b4cb3da7fb;hpb=81fff61a96bece351e381ad3fef8ab1248a952ba;p=pspp-builds.git diff --git a/src/language/data-io/list.q b/src/language/data-io/list.q index dd9a8ae1..54b09c34 100644 --- a/src/language/data-io/list.q +++ b/src/language/data-io/list.q @@ -30,6 +30,7 @@ #include #include #include +#include #include #include #include @@ -51,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) */ @@ -82,11 +83,11 @@ static unsigned n_chars_width (struct outp_driver *d); static void write_line (struct outp_driver *d, const char *s); /* Other functions. */ -static bool list_cases (struct ccase *, void *); +static bool list_cases (const 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 (const struct ccase *, void *); /* Returns the number of text lines that can fit on the remainder of the page. */ @@ -117,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; @@ -133,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. */ @@ -144,7 +145,7 @@ cmd_list (void) if (cmd.last == NOT_LONG) cmd.last = LONG_MAX; if (!cmd.sbc_variables) - dict_get_vars (default_dict, &cmd.v_variables, &cmd.n_variables, + dict_get_vars (dataset_dict (current_dataset), &cmd.v_variables, &cmd.n_variables, (1u << DC_SYSTEM) | (1u << DC_SCRATCH)); if (cmd.n_variables == 0) { @@ -184,12 +185,12 @@ cmd_list (void) /* Weighting variable. */ if (cmd.weight == LST_WEIGHT) { - if (dict_get_weight (default_dict) != NULL) + if (dict_get_weight (dataset_dict (current_dataset)) != NULL) { size_t i; for (i = 0; i < cmd.n_variables; i++) - if (cmd.v_variables[i] == dict_get_weight (default_dict)) + if (cmd.v_variables[i] == dict_get_weight (dataset_dict (current_dataset))) break; if (i >= cmd.n_variables) { @@ -198,7 +199,7 @@ cmd_list (void) cmd.v_variables = xnrealloc (cmd.v_variables, cmd.n_variables, sizeof *cmd.v_variables); cmd.v_variables[cmd.n_variables - 1] - = dict_get_weight (default_dict); + = dict_get_weight (dataset_dict (current_dataset)); } } else @@ -228,7 +229,7 @@ cmd_list (void) determine_layout (); case_idx = 0; - ok = procedure_with_splits (write_all_headers, list_cases, NULL, NULL); + ok = procedure_with_splits (current_dataset, write_all_headers, list_cases, NULL, NULL); ds_destroy(&line_buffer); clean_up (); @@ -239,10 +240,11 @@ 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 *aux UNUSED) +write_all_headers (const struct ccase *c, void *aux UNUSED) { struct outp_driver *d; + output_split_file_values (c); for (d = outp_drivers (NULL); d; d = outp_drivers (d)) { if (!d->class->special) @@ -267,7 +269,7 @@ write_all_headers (void *aux UNUSED) fputs (" \n", x->file); } else - assert (0); + NOT_REACHED (); } } @@ -385,7 +387,7 @@ clean_up (void) } } else - assert (0); + NOT_REACHED (); free (cmd.v_variables); } @@ -409,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; @@ -436,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) @@ -445,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 @@ -471,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); @@ -599,12 +604,12 @@ 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. */ static bool -list_cases (struct ccase *c, void *aux UNUSED) +list_cases (const struct ccase *c, void *aux UNUSED) { struct outp_driver *d; @@ -622,7 +627,7 @@ list_cases (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); } @@ -645,34 +650,34 @@ list_cases (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)) @@ -681,7 +686,7 @@ list_cases (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) @@ -695,7 +700,6 @@ list_cases (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)); @@ -706,16 +710,15 @@ list_cases (struct ccase *c, void *aux UNUSED) data_out (buf, &v->print, &case_idx_value); } - ls_init (&s, buf, v->print.w); fputs (" ", x->file); - html_put_cell_contents (d, TAB_FIX, &s); + html_put_cell_contents (d, TAB_FIX, ss_buffer (buf, v->print.w)); fputs ("\n", x->file); } fputs (" \n", x->file); } else - assert (0); + NOT_REACHED (); return true; }