X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fdata-io%2Flist.q;h=d4e24cddfb0e9313b98a74e9dd1121ae7fd8e03f;hb=19d0debdc5b72e1bb6c79956403a4d3bc054f300;hp=cd5de5c33089a44678cbb29910e27e2358f68d89;hpb=18f6e8958244f938e9e9a03a4230cacf0d22a470;p=pspp-builds.git diff --git a/src/language/data-io/list.q b/src/language/data-io/list.q index cd5de5c3..d4e24cdd 100644 --- a/src/language/data-io/list.q +++ b/src/language/data-io/list.q @@ -26,6 +26,7 @@ #include "size_max.h" #include #include +#include #include #include #include @@ -43,6 +44,8 @@ #include #include +#include "minmax.h" + #include "gettext.h" #define _(msgid) gettext (msgid) @@ -52,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) */ @@ -83,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 (const 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 (const struct ccase *, 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. */ @@ -129,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, NULL)) + if (!parse_list (lexer, ds, &cmd, NULL)) return CMD_FAILURE; /* Fill in defaults. */ @@ -145,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) { @@ -185,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) { @@ -199,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 @@ -213,9 +216,9 @@ cmd_list (void) strcpy (casenum_var.name, "Case#"); casenum_var.type = NUMERIC; casenum_var.fv = -1; - casenum_var.print = make_output_format (FMT_F, - (cmd.last == LONG_MAX - ? 5 : intlog10 (cmd.last)), 0); + casenum_var.print = fmt_for_output (FMT_F, + (cmd.last == LONG_MAX + ? 5 : intlog10 (cmd.last)), 0); /* Add the weight variable at the beginning of the variable list. */ cmd.n_variables++; @@ -229,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 (); @@ -240,11 +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 (const struct ccase *c, 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 (c); + output_split_file_values (ds, c); for (d = outp_drivers (NULL); d; d = outp_drivers (d)) { if (!d->class->special) @@ -269,7 +272,7 @@ write_all_headers (const struct ccase *c, void *aux UNUSED) fputs (" \n", x->file); } else - assert (0); + NOT_REACHED (); } } @@ -325,7 +328,7 @@ write_header (struct outp_driver *d) struct variable *v = cmd.v_variables[i]; memset (&prc->header[prc->header_rows - 1][x], '-', - max (v->print.w, (int) strlen (v->name))); + 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)); @@ -387,7 +390,7 @@ clean_up (void) } } else - assert (0); + NOT_REACHED (); free (cmd.v_variables); } @@ -532,7 +535,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; @@ -543,7 +546,7 @@ 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)); + width += MAX (v->print.w, (int) strlen (v->name)); } if (width <= max_width) { @@ -573,7 +576,7 @@ determine_layout (void) { struct variable *v = cmd.v_variables[column]; int trial_width = (width - v->print.w - + max (v->print.w, (int) strlen (v->name))); + + MAX (v->print.w, (int) strlen (v->name))); if (trial_width > max_width) { @@ -589,7 +592,7 @@ determine_layout (void) for (prc->header_rows = 0, column = 0; column < prc->n_vertical; column++) - prc->header_rows = max (prc->header_rows, + prc->header_rows = MAX (prc->header_rows, strlen (cmd.v_variables[column]->name)); prc->header_rows++; continue; @@ -609,7 +612,7 @@ determine_layout (void) /* Writes case C to output. */ static bool -list_cases (const struct ccase *c, void *aux UNUSED) +list_cases (const struct ccase *c, void *aux UNUSED, const struct dataset *ds UNUSED) { struct outp_driver *d; @@ -637,7 +640,7 @@ list_cases (const struct ccase *c, void *aux UNUSED) int width; if (prc->type == 0 && column >= prc->n_vertical) - width = max ((int) strlen (v->name), v->print.w); + width = MAX ((int) strlen (v->name), v->print.w); else width = v->print.w; @@ -664,17 +667,17 @@ list_cases (const struct ccase *c, void *aux UNUSED) ds_put_char_multiple(&line_buffer, ' ', width - v->print.w); } - if ((formats[v->print.type].cat & FCAT_STRING) || v->fv != -1) + 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, ' '); @@ -701,13 +704,13 @@ list_cases (const struct ccase *c, void *aux UNUSED) struct variable *v = cmd.v_variables[column]; char buf[256]; - 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 (v->print.type) || v->fv != -1) + 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 (" ", x->file); @@ -718,7 +721,7 @@ list_cases (const struct ccase *c, void *aux UNUSED) fputs (" \n", x->file); } else - assert (0); + NOT_REACHED (); return true; }