X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fdictionary%2Fsys-file-info.c;h=220faa3b2a97c0684f1159e4ee2b64722a3c71fc;hb=888d0f91d57e0c3c5a4206c30ac71eb87bf44227;hp=1f9bc7e49d7b7830cd4f9e2db6997cd4c97ce821;hpb=8444d8d47de5e5f8d076b6f43f73c2c29494031e;p=pspp-builds.git diff --git a/src/language/dictionary/sys-file-info.c b/src/language/dictionary/sys-file-info.c index 1f9bc7e4..220faa3b 100644 --- a/src/language/dictionary/sys-file-info.c +++ b/src/language/dictionary/sys-file-info.c @@ -1,5 +1,5 @@ /* PSPP - computes sample statistics. - Copyright (C) 1997-9, 2000 Free Software Foundation, Inc. + 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 @@ -18,25 +18,32 @@ 02110-1301, USA. */ #include -#include + #include #include -#include -#include -#include + #include -#include #include -#include +#include +#include +#include +#include +#include +#include #include +#include +#include +#include +#include #include +#include +#include #include -#include -#include #include +#include #include -#include -#include + +#include "minmax.h" #include "gettext.h" #define _(msgid) gettext (msgid) @@ -65,7 +72,7 @@ sysfile_info_dim (struct tab_table *t, struct outp_driver *d) int i; for (p = max; *p; p++) - t->w[p - max] = min (tab_natural_width (t, d, p - max), + t->w[p - max] = MIN (tab_natural_width (t, d, p - max), *p * d->prop_em_width); for (i = 0; i < t->nr; i++) t->h[i] = tab_natural_height (t, d, i); @@ -73,7 +80,7 @@ sysfile_info_dim (struct tab_table *t, struct outp_driver *d) /* SYSFILE INFO utility. */ int -cmd_sysfile_info (void) +cmd_sysfile_info (struct lexer *lexer, struct dataset *ds UNUSED) { struct file_handle *h; struct dictionary *d; @@ -83,10 +90,10 @@ cmd_sysfile_info (void) int r, nr; int i; - lex_match_id ("FILE"); - lex_match ('='); + lex_match_id (lexer, "FILE"); + lex_match (lexer, '='); - h = fh_parse (FH_REF_FILE); + h = fh_parse (lexer, FH_REF_FILE); if (!h) return CMD_FAILURE; @@ -98,7 +105,7 @@ cmd_sysfile_info (void) t = tab_create (2, 9, 0); tab_vline (t, TAL_GAP, 1, 0, 8); tab_text (t, 0, 0, TAB_LEFT, _("File:")); - tab_text (t, 1, 0, TAB_LEFT, fh_get_filename (h)); + tab_text (t, 1, 0, TAB_LEFT, fh_get_file_name (h)); tab_text (t, 0, 1, TAB_LEFT, _("Label:")); { const char *label = dict_get_label (d); @@ -123,7 +130,8 @@ cmd_sysfile_info (void) { struct variable *weight_var = dict_get_weight (d); tab_text (t, 1, 7, TAB_LEFT, - weight_var != NULL ? weight_var->name : _("Not weighted.")); + (weight_var != NULL + ? var_get_name (weight_var) : _("Not weighted."))); } tab_text (t, 0, 8, TAB_LEFT, _("Mode:")); tab_text (t, 1, 8, TAB_LEFT | TAT_PRINTF, @@ -147,7 +155,7 @@ cmd_sysfile_info (void) if (r + 10 + nvl > nr) { - nr = max (nr * dict_get_var_cnt (d) / (i + 1), nr); + nr = MAX (nr * dict_get_var_cnt (d) / (i + 1), nr); nr += 10 + nvl; tab_realloc (t, 4, nr); } @@ -165,18 +173,18 @@ cmd_sysfile_info (void) dict_destroy (d); - return lex_end_of_command (); + return lex_end_of_command (lexer); } /* DISPLAY utility. */ static void display_macros (void); -static void display_documents (void); +static void display_documents (const struct dictionary *dict); static void display_variables (struct variable **, size_t, int); -static void display_vectors (int sorted); +static void display_vectors (const struct dictionary *dict, int sorted); int -cmd_display (void) +cmd_display (struct lexer *lexer, struct dataset *ds) { /* Whether to sort the list of variables alphabetically. */ int sorted; @@ -185,22 +193,22 @@ cmd_display (void) size_t n; struct variable **vl; - if (lex_match_id ("MACROS")) + if (lex_match_id (lexer, "MACROS")) display_macros (); - else if (lex_match_id ("DOCUMENTS")) - display_documents (); - else if (lex_match_id ("FILE")) + else if (lex_match_id (lexer, "DOCUMENTS")) + display_documents (dataset_dict (ds)); + else if (lex_match_id (lexer, "FILE")) { som_blank_line (); - if (!lex_force_match_id ("LABEL")) + if (!lex_force_match_id (lexer, "LABEL")) return CMD_FAILURE; - if (dict_get_label (default_dict) == NULL) + if (dict_get_label (dataset_dict (ds)) == NULL) tab_output_text (TAB_LEFT, _("The active file does not have a file label.")); else { tab_output_text (TAB_LEFT | TAT_TITLE, _("File label:")); - tab_output_text (TAB_LEFT | TAB_FIX, dict_get_label (default_dict)); + tab_output_text (TAB_LEFT | TAB_FIX, dict_get_label (dataset_dict (ds))); } } else @@ -211,12 +219,13 @@ cmd_display (void) const char **cp; int as; - sorted = lex_match_id ("SORTED"); + sorted = lex_match_id (lexer, "SORTED"); for (cp = sbc; *cp; cp++) - if (token == T_ID && lex_id_match (*cp, tokid)) + if (lex_token (lexer) == T_ID + && lex_id_match (ss_cstr (*cp), ss_cstr (lex_tokid (lexer)))) { - lex_get (); + lex_get (lexer); break; } as = cp - sbc; @@ -226,17 +235,17 @@ cmd_display (void) if (as == AS_VECTOR) { - display_vectors (sorted); + display_vectors (dataset_dict(ds), sorted); return CMD_SUCCESS; } - lex_match ('/'); - lex_match_id ("VARIABLES"); - lex_match ('='); + lex_match (lexer, '/'); + lex_match_id (lexer, "VARIABLES"); + lex_match (lexer, '='); - if (token != '.') + if (lex_token (lexer) != '.') { - if (!parse_variables (default_dict, &vl, &n, PV_NONE)) + if (!parse_variables (lexer, dataset_dict (ds), &vl, &n, PV_NONE)) { free (vl); return CMD_FAILURE; @@ -244,13 +253,13 @@ cmd_display (void) as = AS_DICTIONARY; } else - dict_get_vars (default_dict, &vl, &n, 0); + dict_get_vars (dataset_dict (ds), &vl, &n, 0); if (as == AS_SCRATCH) { size_t i, m; for (i = 0, m = n; i < n; i++) - if (dict_class_from_id (vl[i]->name) != DC_SCRATCH) + if (dict_class_from_id (var_get_name (vl[i])) != DC_SCRATCH) { vl[i] = NULL; m--; @@ -266,14 +275,14 @@ cmd_display (void) } if (sorted) - sort (vl, n, sizeof *vl, compare_var_names, NULL); + sort (vl, n, sizeof *vl, compare_var_ptr_names, NULL); display_variables (vl, n, as); free (vl); } - return lex_end_of_command (); + return lex_end_of_command (lexer); } static void @@ -284,9 +293,9 @@ display_macros (void) } static void -display_documents (void) +display_documents (const struct dictionary *dict) { - const char *documents = dict_get_documents (default_dict); + const char *documents = dict_get_documents (dict); som_blank_line (); if (documents == NULL) @@ -329,8 +338,8 @@ variables_dim (struct tab_table *t, struct outp_driver *d) t->w[0] = tab_natural_width (t, d, 0); if (_as == AS_DICTIONARY || _as == AS_VARIABLES || _as == AS_LABELS) { - t->w[1] = max (tab_natural_width (t, d, 1), d->prop_em_width * 5); - t->w[2] = max (tab_natural_width (t, d, 2), d->prop_em_width * 35); + t->w[1] = MAX (tab_natural_width (t, d, 1), d->prop_em_width * 5); + t->w[2] = MAX (tab_natural_width (t, d, 2), d->prop_em_width * 35); pc = 3; } else pc = 1; @@ -394,17 +403,20 @@ display_variables (struct variable **vl, size_t n, int as) if (r + 10 + nvl > nr) { - nr = max (nr * n / (i + 1), nr); + nr = MAX (nr * n / (i + 1), nr); nr += 10 + nvl; tab_realloc (t, nc, nr); } r = describe_variable (v, t, r, as); } else { - tab_text (t, 0, r, TAB_LEFT, v->name); - if (as == AS_LABELS) - tab_joint_text (t, 1, r, 2, r, TAB_LEFT, - v->label == NULL ? "(no label)" : v->label); + tab_text (t, 0, r, TAB_LEFT, var_get_name (v)); + if (as == AS_LABELS) + { + const char *label = var_get_label (v); + tab_joint_text (t, 1, r, 2, r, TAB_LEFT, + label != NULL ? "(no label)" : label); + } if (as != AS_NAMES) { tab_text (t, pc, r, TAT_PRINTF, "%d", v->index + 1); @@ -434,37 +446,40 @@ display_variables (struct variable **vl, size_t n, int as) static int describe_variable (struct variable *v, struct tab_table *t, int r, int as) { + const struct fmt_spec *print = var_get_print_format (v); + const struct fmt_spec *write = var_get_write_format (v); + /* Put the name, var label, and position into the first row. */ - tab_text (t, 0, r, TAB_LEFT, v->name); + tab_text (t, 0, r, TAB_LEFT, var_get_name (v)); tab_text (t, 3, r, TAT_PRINTF, "%d", v->index + 1); - if (as == AS_DICTIONARY && v->label) + if (as == AS_DICTIONARY && var_has_label (v)) { - tab_joint_text (t, 1, r, 2, r, TAB_LEFT, v->label); + tab_joint_text (t, 1, r, 2, r, TAB_LEFT, var_get_label (v)); r++; } /* Print/write format, or print and write formats. */ - if (v->print.type == v->write.type - && v->print.w == v->write.w - && v->print.d == v->write.d) + if (fmt_equal (print, write)) { + char str[FMT_STRING_LEN_MAX + 1]; tab_joint_text (t, 1, r, 2, r, TAB_LEFT | TAT_PRINTF, _("Format: %s"), - fmt_to_string (&v->print)); + fmt_to_string (print, str)); r++; } else { + char str[FMT_STRING_LEN_MAX + 1]; tab_joint_text (t, 1, r, 2, r, TAB_LEFT | TAT_PRINTF, - _("Print Format: %s"), fmt_to_string (&v->print)); + _("Print Format: %s"), fmt_to_string (print, str)); r++; tab_joint_text (t, 1, r, 2, r, TAB_LEFT | TAT_PRINTF, - _("Write Format: %s"), fmt_to_string (&v->write)); + _("Write Format: %s"), fmt_to_string (write, str)); r++; } /* Missing values if any. */ - if (!mv_is_empty (&v->miss)) + if (var_has_missing_values (v)) { char buf[128]; char *cp; @@ -472,17 +487,18 @@ describe_variable (struct variable *v, struct tab_table *t, int r, int as) int cnt = 0; cp = stpcpy (buf, _("Missing Values: ")); - mv_copy (&mv, &v->miss); + + mv_copy (&mv, var_get_missing_values (v)); if (mv_has_range (&mv)) { double x, y; mv_pop_range (&mv, &x, &y); if (x == LOWEST) - cp += nsprintf (cp, "LOWEST THRU %g", y); + cp += sprintf (cp, "LOWEST THRU %g", y); else if (y == HIGHEST) - cp += nsprintf (cp, "%g THRU HIGHEST", x); + cp += sprintf (cp, "%g THRU HIGHEST", x); else - cp += nsprintf (cp, "%g THRU %g", x, y); + cp += sprintf (cp, "%g THRU %g", x, y); cnt++; } while (mv_has_value (&mv)) @@ -490,14 +506,14 @@ describe_variable (struct variable *v, struct tab_table *t, int r, int as) union value value; mv_pop_value (&mv, &value); if (cnt++ > 0) - cp += nsprintf (cp, "; "); - if (v->type == NUMERIC) - cp += nsprintf (cp, "%g", value.f); + cp += sprintf (cp, "; "); + if (var_is_numeric (v)) + cp += sprintf (cp, "%g", value.f); else { *cp++ = '"'; - memcpy (cp, value.s, v->width); - cp += v->width; + memcpy (cp, value.s, var_get_width (v)); + cp += var_get_width (v); *cp++ = '"'; *cp = '\0'; } @@ -526,10 +542,10 @@ describe_variable (struct variable *v, struct tab_table *t, int r, int as) { char buf[128]; - if (v->type == ALPHA) + if (var_is_alpha (v)) { - memcpy (buf, vl->value.s, v->width); - buf[v->width] = 0; + memcpy (buf, vl->value.s, var_get_width (v)); + buf[var_get_width (v)] = 0; } else sprintf (buf, "%g", vl->value.f); @@ -562,14 +578,14 @@ compare_vectors_by_name (const void *a_, const void *b_) /* Display a list of vectors. If SORTED is nonzero then they are sorted alphabetically. */ static void -display_vectors (int sorted) +display_vectors (const struct dictionary *dict, int sorted) { const struct vector **vl; int i; struct tab_table *t; size_t nvec; - nvec = dict_get_vector_cnt (default_dict); + nvec = dict_get_vector_cnt (dict); if (nvec == 0) { msg (SW, _("No vectors defined.")); @@ -578,7 +594,7 @@ display_vectors (int sorted) vl = xnmalloc (nvec, sizeof *vl); for (i = 0; i < nvec; i++) - vl[i] = dict_get_vector (default_dict, i); + vl[i] = dict_get_vector (dict, i); if (sorted) qsort (vl, nvec, sizeof *vl, compare_vectors_by_name);