X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fdata-io%2Flist.q;h=b5a16f265481e8d4d5bc0c957a3412235da3e039;hb=f15c854d8500105766b2f5666bb62b983ff24f88;hp=b212efeb308ae63ee86b6577220ccf365e0ba32d;hpb=8444d8d47de5e5f8d076b6f43f73c2c29494031e;p=pspp-builds.git diff --git a/src/language/data-io/list.q b/src/language/data-io/list.q index b212efeb..b5a16f26 100644 --- a/src/language/data-io/list.q +++ b/src/language/data-io/list.q @@ -1,59 +1,63 @@ -/* PSPP - computes sample statistics. - Copyright (C) 1997-9, 2000 Free Software Foundation, Inc. - Written by Ben Pfaff . +/* PSPP - a program for statistical analysis. + Copyright (C) 1997-9, 2000, 2006, 2009 Free Software Foundation, Inc. - This program is free software; you can redistribute it and/or - modify it under the terms of the GNU General Public License as - published by the Free Software Foundation; either version 2 of the - License, or (at your option) any later version. + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. - This program is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - 02110-1301, USA. */ + along with this program. If not, see . */ #include -#include + +#include #include #include -#include -#include -#include -#include -#include + #include "intprops.h" +#include "xmalloca.h" + +#include +#include +#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 "xalloc.h" #include "gettext.h" #define _(msgid) gettext (msgid) /* (headers) */ -#include - /* (specification) 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) */ @@ -70,23 +74,21 @@ struct list_ext /* Parsed command. */ static struct cmd_list cmd; -/* Current case number. */ -static int case_idx; - /* Line buffer. */ -static char *line_buf; +static struct string line_buffer; /* TTY-style output functions. */ static unsigned n_lines_remaining (struct outp_driver *d); static unsigned n_chars_width (struct outp_driver *d); -static void write_line (struct outp_driver *d, char *s); +static void write_line (struct outp_driver *d, const char *s); /* Other functions. */ -static bool list_cases (struct ccase *, void *); +static void list_case (const struct ccase *, casenumber case_idx, + 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 (struct casereader *, const struct dataset*); /* Returns the number of text lines that can fit on the remainder of the page. */ @@ -110,14 +112,14 @@ n_chars_width (struct outp_driver *d) /* Writes the line S at the current position and advances to the next line. */ static void -write_line (struct outp_driver *d, char *s) +write_line (struct outp_driver *d, const char *s) { struct outp_text text; - + 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; @@ -125,27 +127,31 @@ write_line (struct outp_driver *d, char *s) d->cp_x = 0; d->cp_y += d->font_height; } - + /* Parses and executes the LIST procedure. */ int -cmd_list (void) +cmd_list (struct lexer *lexer, struct dataset *ds) { - struct variable casenum_var; + struct dictionary *dict = dataset_dict (ds); + struct variable *casenum_var = NULL; + struct casegrouper *grouper; + struct casereader *group; + casenumber case_idx; bool ok; - if (!parse_list (&cmd)) + if (!parse_list (lexer, ds, &cmd, NULL)) return CMD_FAILURE; - + /* Fill in defaults. */ - if (cmd.step == NOT_LONG) + if (cmd.step == LONG_MIN) cmd.step = 1; - if (cmd.first == NOT_LONG) + if (cmd.first == LONG_MIN) cmd.first = 1; - if (cmd.last == NOT_LONG) + if (cmd.last == LONG_MIN) cmd.last = LONG_MAX; if (!cmd.sbc_variables) - dict_get_vars (default_dict, &cmd.v_variables, &cmd.n_variables, - (1u << DC_SYSTEM) | (1u << DC_SCRATCH)); + dict_get_vars (dict, &cmd.v_variables, &cmd.n_variables, + DC_SYSTEM | DC_SCRATCH); if (cmd.n_variables == 0) { msg (SE, _("No variables specified.")); @@ -184,12 +190,12 @@ cmd_list (void) /* Weighting variable. */ if (cmd.weight == LST_WEIGHT) { - if (dict_get_weight (default_dict) != NULL) + if (dict_get_weight (dict) != 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 (dict)) break; if (i >= cmd.n_variables) { @@ -198,7 +204,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 (dict); } } else @@ -209,12 +215,10 @@ cmd_list (void) 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 = make_output_format (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++; @@ -222,26 +226,52 @@ cmd_list (void) 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 (); case_idx = 0; - ok = procedure_with_splits (write_all_headers, list_cases, NULL, NULL); - free (line_buf); + for (grouper = casegrouper_create_splits (proc_open (ds), dict); + casegrouper_get_next_group (grouper, &group); + casereader_destroy (group)) + { + struct ccase *c; + + write_all_headers (group, ds); + for (; (c = casereader_read (group)) != NULL; case_unref (c)) + { + case_idx++; + if (case_idx >= cmd.first && case_idx <= cmd.last + && (case_idx - cmd.first) % cmd.step == 0) + list_case (c, case_idx, ds); + } + } + ok = casegrouper_destroy (grouper); + ok = proc_commit (ds) && ok; + + ds_destroy(&line_buffer); clean_up (); + var_destroy (casenum_var); + return ok ? CMD_SUCCESS : CMD_CASCADING_FAILURE; } /* 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 (struct casereader *input, const struct dataset *ds) { struct outp_driver *d; + struct ccase *c; + + c = casereader_peek (input, 0); + if (c == NULL) + return; + output_split_file_values (ds, c); + case_unref (c); for (d = outp_drivers (NULL); d; d = outp_drivers (d)) { @@ -253,21 +283,21 @@ write_all_headers (void *aux UNUSED) else if (d->class == &html_class) { struct html_driver_ext *x = d->ext; - + fputs ("\n \n", x->file); - + { size_t i; for (i = 0; i < cmd.n_variables; i++) fprintf (x->file, " \n", - cmd.v_variables[i]->name); + var_get_name (cmd.v_variables[i])); } fputs (" \n", x->file); } else - assert (0); + NOT_REACHED (); } } @@ -280,7 +310,7 @@ write_header (struct outp_driver *d) if (!prc->header_rows) return; - + if (n_lines_remaining (d) < prc->header_rows + 1) { outp_eject_page (d); @@ -292,7 +322,7 @@ write_header (struct outp_driver *d) { size_t i; size_t x; - + /* Allocate, initialize header. */ prc->header = xnmalloc (prc->header_rows, sizeof *prc->header); { @@ -307,27 +337,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. */ @@ -344,23 +380,23 @@ write_header (struct outp_driver *d) } /* Write out the header, in back-to-front order except for the last line. */ - if (prc->header_rows >= 2) + if (prc->header_rows >= 2) { size_t i; - + for (i = prc->header_rows - 1; i-- != 0; ) - write_line (d, prc->header[i]); + write_line (d, prc->header[i]); } write_line (d, prc->header[prc->header_rows - 1]); } - - + + /* Frees up all the memory we've allocated. */ static void clean_up (void) { struct outp_driver *d; - + for (d = outp_drivers (NULL); d; d = outp_drivers (d)) if (d->class->special == 0) { @@ -385,8 +421,8 @@ clean_up (void) } } else - assert (0); - + NOT_REACHED (); + free (cmd.v_variables); } @@ -398,7 +434,7 @@ write_varname (struct outp_driver *d, char *string, int indent) { struct outp_text text; int width; - + if (d->cp_x + outp_string_width (d, string, OUTP_FIXED) > d->width) { d->cp_y += d->font_height; @@ -409,7 +445,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; @@ -424,33 +460,35 @@ static void write_fallback_headers (struct outp_driver *d) { const int max_width = n_chars_width(d) - 10; - + int index = 0; int width = 0; int line_number = 0; const char *Line = _("Line"); - char *leader = local_alloc (strlen (Line) - + INT_STRLEN_BOUND (line_number) + 1 + 1); - + char *leader = xmalloca (strlen (Line) + + INT_STRLEN_BOUND (line_number) + 1 + 1); + 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) outp_eject_page (d); - + /* The leader is a string like `Line 1: '. Write the leader. */ 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 @@ -459,7 +497,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,11 +507,12 @@ write_fallback_headers (struct outp_driver *d) } width += var_width; } - + { - char varname[10]; - sprintf (varname, " %s", cmd.v_variables[index]->name); - write_varname (d, varname, text.h); + char varname[VAR_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); @@ -481,8 +520,8 @@ write_fallback_headers (struct outp_driver *d) } d->cp_x = 0; d->cp_y += d->font_height; - - local_free (leader); + + freea (leader); } /* There are three possible layouts for the LIST procedure: @@ -505,11 +544,11 @@ static void determine_layout (void) { struct outp_driver *d; - + /* This is the largest page width of any driver, so we can tell what size buffer to allocate. */ int largest_page_width = 0; - + for (d = outp_drivers (NULL); d; d = outp_drivers (d)) { size_t column; /* Current column. */ @@ -521,13 +560,13 @@ determine_layout (void) if (d->class == &html_class) continue; - + assert (d->class->special == 0); 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; @@ -537,8 +576,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) { @@ -549,14 +590,16 @@ determine_layout (void) /* Try layout #2. */ for (width = cmd.n_variables - 1, height = 0, column = 0; column < cmd.n_variables && width <= max_width; - column++) + 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 written horizontally. */ if (width <= max_width && height <= SHORT_NAME_LEN) @@ -566,10 +609,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; @@ -584,8 +627,11 @@ determine_layout (void) 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)); + { + 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; } @@ -599,19 +645,16 @@ determine_layout (void) d->cp_y += d->font_height; } - line_buf = xmalloc (max (1022, largest_page_width) + 2); + ds_init_empty (&line_buffer); } /* Writes case C to output. */ -static bool -list_cases (struct ccase *c, void *aux UNUSED) +static void +list_case (const struct ccase *c, casenumber case_idx, + const struct dataset *ds) { + struct dictionary *dict = dataset_dict (ds); struct outp_driver *d; - - case_idx++; - if (case_idx < cmd.first || case_idx > cmd.last - || (cmd.step != 1 && (case_idx - cmd.first) % cmd.step)) - return true; for (d = outp_drivers (NULL); d; d = outp_drivers (d)) if (d->class->special == 0) @@ -619,64 +662,75 @@ list_cases (struct ccase *c, void *aux UNUSED) const struct list_ext *prc = d->prc; const int max_width = n_chars_width (d); int column; - int x = 0; if (!prc->header_rows) - x = nsprintf (line_buf, "%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); + { + int name_len = strlen (var_get_name (v)); + width = MAX (name_len, print->w); + } else - width = v->print.w; + width = print->w; - if (width + x > max_width && x != 0) + if (width + ds_length(&line_buffer) > max_width && + ds_length(&line_buffer) != 0) { if (!n_lines_remaining (d)) { outp_eject_page (d); write_header (d); } - - line_buf[x] = 0; - write_line (d, line_buf); - x = 0; + write_line (d, ds_cstr (&line_buffer)); + ds_clear(&line_buffer); + if (!prc->header_rows) - x = nsprintf (line_buf, "%8s: ", v->name); + ds_put_format (&line_buffer, "%8s: ", var_get_name (v)); } - if (width > v->print.w) + if (width > print->w) + ds_put_char_multiple(&line_buffer, ' ', width - print->w); + + if (fmt_is_string (print->type) + || dict_contains_var (dict, v)) { - memset(&line_buf[x], ' ', width - v->print.w); - x += width - v->print.w; + char *s = data_out (case_data (c, v), print); + ds_put_cstr (&line_buffer, s); + free (s); } - - if ((formats[v->print.type].cat & FCAT_STRING) || v->fv != -1) - data_out (&line_buf[x], &v->print, case_data (c, v->fv)); - else + else { + char *s; union value case_idx_value; case_idx_value.f = case_idx; - data_out (&line_buf[x], &v->print, &case_idx_value); + s = data_out (&case_idx_value, print); + ds_put_cstr (&line_buffer, s); + free (s); } - x += v->print.w; - - line_buf[x++] = ' '; + + ds_put_char (&line_buffer, ' '); } - + if (!n_lines_remaining (d)) { outp_eject_page (d); write_header (d); } - - line_buf[x] = 0; - write_line (d, line_buf); + + write_line (d, ds_cstr (&line_buffer)); + ds_clear(&line_buffer); } else if (d->class == &html_class) { @@ -684,37 +738,36 @@ list_cases (struct ccase *c, void *aux UNUSED) int column; fputs (" \n", x->file); - + for (column = 0; column < cmd.n_variables; column++) { - 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)); - else + const struct variable *v = cmd.v_variables[column]; + const struct fmt_spec *print = var_get_print_format (v); + char *s = NULL; + + if (fmt_is_string (print->type) + || dict_contains_var (dict, v)) + s = data_out (case_data (c, v), print); + else { union value case_idx_value; case_idx_value.f = case_idx; - data_out (buf, &v->print, &case_idx_value); + s = data_out (&case_idx_value, print); } - ls_init (&s, buf, v->print.w); fputs (" \n", x->file); } - + fputs (" \n", x->file); } else - assert (0); - - return true; + NOT_REACHED (); } -/* +/* Local Variables: mode: c End:
%s
", x->file); - html_put_cell_contents (d, TAB_FIX, &s); + html_put_cell_contents (d, TAB_FIX, ss_buffer (s, print->w)); + free (s); fputs ("