X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fdata-io%2Flist.q;h=50fe1201f80139d623f9df7013ef58d4296a6b9e;hb=48386ee68a5283653435d05a9ea4e449710fd370;hp=71238e8eee3984089b2ac02d443b874d0ea54aec;hpb=3816248a008a4af75aac6319d0c9929cb7ff679e;p=pspp-builds.git diff --git a/src/language/data-io/list.q b/src/language/data-io/list.q index 71238e8e..50fe1201 100644 --- a/src/language/data-io/list.q +++ b/src/language/data-io/list.q @@ -1,6 +1,5 @@ /* PSPP - computes sample statistics. Copyright (C) 1997-9, 2000, 2006 Free Software Foundation, Inc. - Written by Ben Pfaff . This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -44,6 +43,8 @@ #include #include +#include "minmax.h" + #include "gettext.h" #define _(msgid) gettext (msgid) @@ -132,7 +133,7 @@ write_line (struct outp_driver *d, const char *s) int cmd_list (struct lexer *lexer, struct dataset *ds) { - struct variable casenum_var; + struct variable *casenum_var = NULL; bool ok; if (!parse_list (lexer, ds, &cmd, NULL)) @@ -211,12 +212,10 @@ cmd_list (struct lexer *lexer, struct dataset *ds) if (cmd.numbering == LST_NUMBERED) { /* Initialize the case-number variable. */ - strcpy (casenum_var.name, "Case#"); - casenum_var.type = NUMERIC; - casenum_var.fv = -1; - casenum_var.print = fmt_for_output (FMT_F, - (cmd.last == LONG_MAX - ? 5 : intlog10 (cmd.last)), 0); + int width = cmd.last == LONG_MAX ? 5 : intlog10 (cmd.last); + struct fmt_spec format = fmt_for_output (FMT_F, width, 0); + casenum_var = var_create ("Case#", 0); + var_set_both_formats (casenum_var, &format); /* Add the weight variable at the beginning of the variable list. */ cmd.n_variables++; @@ -224,7 +223,7 @@ cmd_list (struct lexer *lexer, struct dataset *ds) cmd.n_variables, sizeof *cmd.v_variables); memmove (&cmd.v_variables[1], &cmd.v_variables[0], (cmd.n_variables - 1) * sizeof *cmd.v_variables); - cmd.v_variables[0] = &casenum_var; + cmd.v_variables[0] = casenum_var; } determine_layout (); @@ -235,6 +234,8 @@ cmd_list (struct lexer *lexer, struct dataset *ds) clean_up (); + var_destroy (casenum_var); + return ok ? CMD_SUCCESS : CMD_CASCADING_FAILURE; } @@ -264,7 +265,7 @@ write_all_headers (const struct ccase *c, void *aux UNUSED, const struct dataset 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); @@ -310,27 +311,33 @@ write_header (struct outp_driver *d) /* Put in vertical names. */ for (i = x = 0; i < prc->n_vertical; i++) { - struct variable *v = cmd.v_variables[i]; + const 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; } /* Put in horizontal names. */ for (; i < cmd.n_variables; i++) { - struct variable *v = cmd.v_variables[i]; + const 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. */ @@ -464,7 +471,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; @@ -478,7 +485,7 @@ write_fallback_headers (struct outp_driver *d) { char varname[LONG_NAME_LEN + 2]; snprintf (varname, sizeof varname, - " %s", cmd.v_variables[index]->name); + " %s", var_get_name (cmd.v_variables[index])); write_varname (d, varname, leader_width); } } @@ -533,7 +540,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,8 +550,10 @@ determine_layout (void) /* Try layout #1. */ 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)); + const struct variable *v = cmd.v_variables[column]; + 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) { @@ -557,10 +566,12 @@ determine_layout (void) column < cmd.n_variables && width <= max_width; column++) { - struct variable *v = cmd.v_variables[column]; - width += v->print.w; - if (strlen (v->name) > height) - height = strlen (v->name); + const struct variable *v = cmd.v_variables[column]; + 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 @@ -572,10 +583,10 @@ determine_layout (void) #endif 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))); - + const struct variable *v = cmd.v_variables[column]; + 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; @@ -589,9 +600,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++) + { + const 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; } @@ -610,7 +624,7 @@ determine_layout (void) /* Writes case C to output. */ static bool -list_cases (const struct ccase *c, void *aux UNUSED, const struct dataset *ds UNUSED) +list_cases (const struct ccase *c, void *aux UNUSED, const struct dataset *ds) { struct outp_driver *d; @@ -628,19 +642,24 @@ list_cases (const struct ccase *c, void *aux UNUSED, const struct dataset *ds UN if (!prc->header_rows) { - ds_put_format(&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 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) @@ -655,27 +674,24 @@ list_cases (const struct ccase *c, void *aux UNUSED, const struct dataset *ds UN ds_clear(&line_buffer); if (!prc->header_rows) - { - ds_put_format (&line_buffer, "%8s: ", v->name); - } + ds_put_format (&line_buffer, "%8s: ", var_get_name (v)); } - if (width > v->print.w) - { - ds_put_char_multiple(&line_buffer, ' ', width - v->print.w); - } + if (width > print->w) + ds_put_char_multiple(&line_buffer, ' ', width - print->w); - if (fmt_is_string (v->print.type) || v->fv != -1) + if (fmt_is_string (print->type) + || dict_contains_var (dataset_dict (ds), v)) { - data_out (case_data (c, v->fv), &v->print, - ds_put_uninit (&line_buffer, v->print.w)); + data_out (case_data (c, v), print, + ds_put_uninit (&line_buffer, print->w)); } else { union value case_idx_value; case_idx_value.f = case_idx; - data_out (&case_idx_value, &v->print, - ds_put_uninit (&line_buffer,v->print.w)); + data_out (&case_idx_value, print, + ds_put_uninit (&line_buffer,print->w)); } ds_put_char(&line_buffer, ' '); @@ -699,20 +715,22 @@ list_cases (const struct ccase *c, void *aux UNUSED, const struct dataset *ds UN for (column = 0; column < cmd.n_variables; column++) { - struct variable *v = cmd.v_variables[column]; + const struct variable *v = cmd.v_variables[column]; + const struct fmt_spec *print = var_get_print_format (v); char buf[256]; - if (fmt_is_string (v->print.type) || v->fv != -1) - data_out (case_data (c, v->fv), &v->print, buf); + if (fmt_is_string (print->type) + || dict_contains_var (dataset_dict (ds), v)) + data_out (case_data (c, v), print, buf); else { union value case_idx_value; case_idx_value.f = case_idx; - data_out (&case_idx_value, &v->print, buf); + data_out (&case_idx_value, print, buf); } fputs (" ", x->file); - html_put_cell_contents (d, TAB_FIX, ss_buffer (buf, v->print.w)); + html_put_cell_contents (d, TAB_FIX, ss_buffer (buf, print->w)); fputs ("\n", x->file); }