X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fdata-io%2Flist.q;h=b1473fe693ff53a4cae6932725cc83682534240a;hb=888d0f91d57e0c3c5a4206c30ac71eb87bf44227;hp=a79c51ada6f452e7f21baa45225377bb7ba96fec;hpb=393668423c1c9456fd82db6b30f25de078915da5;p=pspp-builds.git diff --git a/src/language/data-io/list.q b/src/language/data-io/list.q index a79c51ad..b1473fe6 100644 --- a/src/language/data-io/list.q +++ b/src/language/data-io/list.q @@ -18,27 +18,33 @@ 02110-1301, USA. */ #include -#include + #include #include -#include + +#include "intprops.h" +#include "size_max.h" #include -#include -#include #include -#include "intprops.h" +#include +#include +#include +#include +#include +#include #include -#include +#include +#include #include +#include +#include #include #include -#include -#include "size_max.h" #include +#include #include -#include -#include -#include + +#include "minmax.h" #include "gettext.h" #define _(msgid) gettext (msgid) @@ -49,9 +55,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) */ @@ -80,11 +86,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 *, const struct dataset *); 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 *, const struct dataset*); /* Returns the number of text lines that can fit on the remainder of the page. */ @@ -115,7 +121,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; @@ -126,12 +132,12 @@ write_line (struct outp_driver *d, const char *s) /* Parses and executes the LIST procedure. */ int -cmd_list (void) +cmd_list (struct lexer *lexer, struct dataset *ds) { struct variable casenum_var; bool ok; - if (!parse_list (&cmd)) + if (!parse_list (lexer, ds, &cmd, NULL)) return CMD_FAILURE; /* Fill in defaults. */ @@ -142,7 +148,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 (ds), &cmd.v_variables, &cmd.n_variables, (1u << DC_SYSTEM) | (1u << DC_SCRATCH)); if (cmd.n_variables == 0) { @@ -182,12 +188,12 @@ cmd_list (void) /* Weighting variable. */ if (cmd.weight == LST_WEIGHT) { - if (dict_get_weight (default_dict) != NULL) + if (dict_get_weight (dataset_dict (ds)) != 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 (ds))) break; if (i >= cmd.n_variables) { @@ -196,7 +202,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 (ds)); } } else @@ -207,12 +213,12 @@ cmd_list (void) if (cmd.numbering == LST_NUMBERED) { /* Initialize the case-number variable. */ - strcpy (casenum_var.name, "Case#"); - casenum_var.type = NUMERIC; + int width = cmd.last == LONG_MAX ? 5 : intlog10 (cmd.last); + struct fmt_spec format = fmt_for_output (FMT_F, width, 0); + var_set_name (&casenum_var, "Case#"); + casenum_var.width = 0; casenum_var.fv = -1; - casenum_var.print = make_output_format (FMT_F, - (cmd.last == LONG_MAX - ? 5 : intlog10 (cmd.last)), 0); + var_set_both_formats (&casenum_var, &format); /* Add the weight variable at the beginning of the variable list. */ cmd.n_variables++; @@ -226,7 +232,7 @@ cmd_list (void) determine_layout (); case_idx = 0; - ok = procedure_with_splits (write_all_headers, list_cases, NULL, NULL); + ok = procedure_with_splits (ds, write_all_headers, list_cases, NULL, NULL); ds_destroy(&line_buffer); clean_up (); @@ -237,10 +243,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, const struct dataset *ds) { struct outp_driver *d; + output_split_file_values (ds, c); for (d = outp_drivers (NULL); d; d = outp_drivers (d)) { if (!d->class->special) @@ -259,13 +266,13 @@ write_all_headers (void *aux UNUSED) for (i = 0; i < cmd.n_variables; i++) fprintf (x->file, " %s\n", - cmd.v_variables[i]->name); + var_get_name (cmd.v_variables[i])); } fputs (" \n", x->file); } else - assert (0); + NOT_REACHED (); } } @@ -306,12 +313,15 @@ write_header (struct outp_driver *d) for (i = x = 0; i < prc->n_vertical; i++) { struct variable *v = cmd.v_variables[i]; + const char *name = var_get_name (v); + size_t name_len = strlen (name); + const struct fmt_spec *print = var_get_print_format (v); size_t j; - memset (&prc->header[prc->header_rows - 1][x], '-', v->print.w); - x += v->print.w - 1; - for (j = 0; j < strlen (v->name); j++) - prc->header[strlen (v->name) - j - 1][x] = v->name[j]; + memset (&prc->header[prc->header_rows - 1][x], '-', print->w); + x += print->w - 1; + for (j = 0; j < name_len; j++) + prc->header[name_len - j - 1][x] = name[j]; x += 2; } @@ -319,13 +329,16 @@ write_header (struct outp_driver *d) for (; i < cmd.n_variables; i++) { struct variable *v = cmd.v_variables[i]; + const char *name = var_get_name (v); + size_t name_len = strlen (name); + const struct fmt_spec *print = var_get_print_format (v); memset (&prc->header[prc->header_rows - 1][x], '-', - max (v->print.w, (int) strlen (v->name))); - if ((int) strlen (v->name) < v->print.w) - x += v->print.w - strlen (v->name); - memcpy (&prc->header[0][x], v->name, strlen (v->name)); - x += strlen (v->name) + 1; + MAX (print->w, (int) name_len)); + if ((int) name_len < print->w) + x += print->w - name_len; + memcpy (&prc->header[0][x], name, name_len); + x += name_len + 1; } /* Add null bytes. */ @@ -383,7 +396,7 @@ clean_up (void) } } else - assert (0); + NOT_REACHED (); free (cmd.v_variables); } @@ -407,7 +420,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; @@ -434,6 +447,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) @@ -443,12 +457,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 @@ -457,7 +472,7 @@ write_fallback_headers (struct outp_driver *d) entry: { - int var_width = cmd.v_variables[index]->print.w; + int var_width = var_get_print_format (cmd.v_variables[index])->w; if (width + var_width > max_width && width != 0) { width = 0; @@ -469,9 +484,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", var_get_name (cmd.v_variables[index])); + write_varname (d, varname, leader_width); } } while (++index < cmd.n_variables); @@ -525,7 +541,7 @@ determine_layout (void) outp_open_page (d); max_width = n_chars_width (d); - largest_page_width = max (largest_page_width, max_width); + largest_page_width = MAX (largest_page_width, max_width); prc = d->prc = xmalloc (sizeof *prc); prc->type = 0; @@ -536,7 +552,9 @@ determine_layout (void) for (width = cmd.n_variables - 1, column = 0; column < cmd.n_variables; column++) { struct variable *v = cmd.v_variables[column]; - width += max (v->print.w, (int) strlen (v->name)); + int fmt_width = var_get_print_format (v)->w; + int name_len = strlen (var_get_name (v)); + width += MAX (fmt_width, name_len); } if (width <= max_width) { @@ -550,9 +568,11 @@ determine_layout (void) column++) { struct variable *v = cmd.v_variables[column]; - width += v->print.w; - if (strlen (v->name) > height) - height = strlen (v->name); + int fmt_width = var_get_print_format (v)->w; + size_t name_len = strlen (var_get_name (v)); + width += fmt_width; + if (name_len > height) + height = name_len; } /* If it fit then we need to determine how many labels can be @@ -565,9 +585,9 @@ determine_layout (void) for (column = cmd.n_variables; column-- != 0; ) { struct variable *v = cmd.v_variables[column]; - int trial_width = (width - v->print.w - + max (v->print.w, (int) strlen (v->name))); - + int name_len = strlen (var_get_name (v)); + int fmt_width = var_get_print_format (v)->w; + int trial_width = width - fmt_width + MAX (fmt_width, name_len); if (trial_width > max_width) { prc->n_vertical = column + 1; @@ -581,9 +601,12 @@ determine_layout (void) /* Finally determine the length of the headers. */ for (prc->header_rows = 0, column = 0; column < prc->n_vertical; - column++) - prc->header_rows = max (prc->header_rows, - strlen (cmd.v_variables[column]->name)); + column++) + { + struct variable *var = cmd.v_variables[column]; + size_t name_len = strlen (var_get_name (var)); + prc->header_rows = MAX (prc->header_rows, name_len); + } prc->header_rows++; continue; } @@ -597,12 +620,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, const struct dataset *ds UNUSED) { struct outp_driver *d; @@ -620,19 +643,24 @@ 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: ", + var_get_name (cmd.v_variables[0])); } for (column = 0; column < cmd.n_variables; column++) { struct variable *v = cmd.v_variables[column]; + const struct fmt_spec *print = var_get_print_format (v); int width; - if (prc->type == 0 && column >= prc->n_vertical) - width = max ((int) strlen (v->name), v->print.w); + if (prc->type == 0 && column >= prc->n_vertical) + { + int name_len = strlen (var_get_name (v)); + width = MAX (name_len, print->w); + } else - width = v->print.w; + width = print->w; if (width + ds_length(&line_buffer) > max_width && ds_length(&line_buffer) != 0) @@ -643,34 +671,30 @@ 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: ", var_get_name (v)); } - if (width > v->print.w) - { - ds_putc_multiple(&line_buffer, ' ', width - v->print.w); - } + if (width > print->w) + ds_put_char_multiple(&line_buffer, ' ', width - print->w); - if ((formats[v->print.type].cat & FCAT_STRING) || v->fv != -1) + if (fmt_is_string (print->type) || v->fv != -1) { - data_out (ds_append_uninit(&line_buffer, v->print.w), - &v->print, case_data (c, v->fv)); + data_out (case_data (c, v->fv), print, + ds_put_uninit (&line_buffer, print->w)); } else { union value case_idx_value; case_idx_value.f = case_idx; - data_out (ds_append_uninit(&line_buffer,v->print.w), - &v->print, &case_idx_value); + data_out (&case_idx_value, print, + ds_put_uninit (&line_buffer,print->w)); } - ds_putc(&line_buffer, ' '); + ds_put_char(&line_buffer, ' '); } if (!n_lines_remaining (d)) @@ -679,7 +703,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) @@ -692,28 +716,27 @@ list_cases (struct ccase *c, void *aux UNUSED) for (column = 0; column < cmd.n_variables; column++) { struct variable *v = cmd.v_variables[column]; + const struct fmt_spec *print = var_get_print_format (v); 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)); + if (fmt_is_string (print->type) || v->fv != -1) + data_out (case_data (c, v->fv), 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, print, buf); } - 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, print->w)); fputs ("\n", x->file); } fputs (" \n", x->file); } else - assert (0); + NOT_REACHED (); return true; }