X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fsysfile-info.c;h=5a91fc39b4e8d05b3bb9f3780dc5e84e11f014dd;hb=02ef5fef5288b80a4822e1006f6cb2b1369a55bd;hp=25279b66040f830164fc16d6ba7e9da7297972df;hpb=2e0595dd8e344dbdcab740d7d2a3b67d153d6b39;p=pspp-builds.git diff --git a/src/sysfile-info.c b/src/sysfile-info.c index 25279b66..5a91fc39 100644 --- a/src/sysfile-info.c +++ b/src/sysfile-info.c @@ -18,22 +18,23 @@ 02111-1307, USA. */ #include -#include +#include "error.h" #include #include +#include "algorithm.h" #include "alloc.h" -#include "avl.h" #include "command.h" #include "error.h" #include "file-handle.h" +#include "hash.h" #include "lexer.h" #include "misc.h" #include "output.h" #include "sfm.h" #include "som.h" #include "tab.h" +#include "value-labels.h" #include "var.h" -#include "vector.h" /* Constants for DISPLAY utility. */ enum @@ -76,9 +77,6 @@ cmd_sysfile_info (void) int r, nr; int i; - lex_match_id ("SYSFILE"); - lex_match_id ("INFO"); - lex_match_id ("FILE"); lex_match ('='); @@ -94,10 +92,14 @@ cmd_sysfile_info (void) t = tab_create (2, 9, 0); tab_vline (t, TAL_1 | TAL_SPACING, 1, 0, 8); tab_text (t, 0, 0, TAB_LEFT, _("File:")); - tab_text (t, 1, 0, TAB_LEFT, fh_handle_filename (h)); + tab_text (t, 1, 0, TAB_LEFT, handle_get_filename (h)); tab_text (t, 0, 1, TAB_LEFT, _("Label:")); - tab_text (t, 1, 1, TAB_LEFT, - d->label ? d->label : _("No label.")); + { + const char *label = dict_get_label (d); + if (label == NULL) + label = _("No label."); + tab_text (t, 1, 1, TAB_LEFT, label); + } tab_text (t, 0, 2, TAB_LEFT, _("Created:")); tab_text (t, 1, 2, TAB_LEFT | TAT_PRINTF, "%s %s by %s", inf.creation_date, inf.creation_time, inf.product); @@ -105,22 +107,25 @@ cmd_sysfile_info (void) tab_text (t, 1, 3, TAB_LEFT, inf.bigendian ? _("Big.") : _("Little.")); tab_text (t, 0, 4, TAB_LEFT, _("Variables:")); tab_text (t, 1, 4, TAB_LEFT | TAT_PRINTF, "%d", - d->nvar); + dict_get_var_cnt (d)); tab_text (t, 0, 5, TAB_LEFT, _("Cases:")); tab_text (t, 1, 5, TAB_LEFT | TAT_PRINTF, inf.ncases == -1 ? _("Unknown") : "%d", inf.ncases); tab_text (t, 0, 6, TAB_LEFT, _("Type:")); tab_text (t, 1, 6, TAB_LEFT, _("System File.")); tab_text (t, 0, 7, TAB_LEFT, _("Weight:")); - tab_text (t, 1, 7, TAB_LEFT, - d->weight_var[0] ? d->weight_var : _("Not weighted.")); + { + struct variable *weight_var = dict_get_weight (d); + tab_text (t, 1, 7, TAB_LEFT, + weight_var != NULL ? weight_var->name : _("Not weighted.")); + } tab_text (t, 0, 8, TAB_LEFT, _("Mode:")); tab_text (t, 1, 8, TAB_LEFT | TAT_PRINTF, _("Compression %s."), inf.compressed ? _("on") : _("off")); tab_dim (t, tab_natural_dimensions); tab_submit (t); - nr = 1 + 2 * d->nvar; + nr = 1 + 2 * dict_get_var_cnt (d); t = tab_create (4, nr, 1); tab_dim (t, sysfile_info_dim); tab_headers (t, 0, 0, 1, 0); @@ -128,18 +133,19 @@ cmd_sysfile_info (void) tab_joint_text (t, 1, 0, 2, 0, TAB_LEFT | TAT_TITLE, _("Description")); tab_text (t, 3, 0, TAB_LEFT | TAT_TITLE, _("Position")); tab_hline (t, TAL_2, 0, 3, 1); - for (r = 1, i = 0; i < d->nvar; i++) + for (r = 1, i = 0; i < dict_get_var_cnt (d); i++) { - int nvl = d->var[i]->val_lab ? avl_count (d->var[i]->val_lab) : 0; + struct variable *v = dict_get_var (d, i); + int nvl = val_labs_count (v->val_labs); if (r + 10 + nvl > nr) { - nr = max (nr * d->nvar / (i + 1), nr); + nr = max (nr * dict_get_var_cnt (d) / (i + 1), nr); nr += 10 + nvl; tab_realloc (t, 4, nr); } - r = describe_variable (d->var[i], t, r, AS_DICTIONARY); + r = describe_variable (v, t, r, AS_DICTIONARY); } tab_box (t, TAL_1, TAL_1, -1, -1, 0, 0, 3, r); tab_vline (t, TAL_1, 0, 0, r); @@ -149,7 +155,7 @@ cmd_sysfile_info (void) tab_flags (t, SOMF_NO_TITLE); tab_submit (t); - free_dictionary (d); + dict_destroy (d); return lex_end_of_command (); } @@ -161,8 +167,6 @@ static void display_documents (void); static void display_variables (struct variable **, int, int); static void display_vectors (int sorted); -static int cmp_var_by_name (const void *, const void *); - int cmd_display (void) { @@ -173,8 +177,6 @@ cmd_display (void) int n; struct variable **vl; - lex_match_id ("DISPLAY"); - if (lex_match_id ("MACROS")) display_macros (); else if (lex_match_id ("DOCUMENTS")) @@ -184,13 +186,13 @@ cmd_display (void) som_blank_line (); if (!lex_force_match_id ("LABEL")) return CMD_FAILURE; - if (default_dict.label == NULL) + if (dict_get_label (default_dict) == 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 | TAT_FIX, default_dict.label); + tab_output_text (TAB_LEFT | TAT_FIX, dict_get_label (default_dict)); } } else @@ -226,7 +228,7 @@ cmd_display (void) if (token != '.') { - if (!parse_variables (NULL, &vl, &n, PV_NONE)) + if (!parse_variables (default_dict, &vl, &n, PV_NONE)) { free (vl); return CMD_FAILURE; @@ -234,13 +236,13 @@ cmd_display (void) as = AS_DICTIONARY; } else - fill_all_vars (&vl, &n, FV_NONE); + dict_get_vars (default_dict, &vl, &n, 0); if (as == AS_SCRATCH) { int i, m; for (i = 0, m = n; i < n; i++) - if (vl[i]->name[0] != '#') + if (dict_class_from_id (vl[i]->name) != DC_SCRATCH) { vl[i] = NULL; m--; @@ -256,7 +258,7 @@ cmd_display (void) } if (sorted) - qsort (vl, n, sizeof *vl, cmp_var_by_name); + sort (vl, n, sizeof *vl, compare_variables, NULL); display_variables (vl, n, as); @@ -266,12 +268,6 @@ cmd_display (void) return lex_end_of_command (); } -static int -cmp_var_by_name (const void *a, const void *b) -{ - return strcmp ((*((struct variable **) a))->name, (*((struct variable **) b))->name); -} - static void display_macros (void) { @@ -282,24 +278,27 @@ display_macros (void) static void display_documents (void) { + const char *documents = dict_get_documents (default_dict); + som_blank_line (); - if (default_dict.n_documents == 0) + if (documents == NULL) tab_output_text (TAB_LEFT, _("The active file dictionary does not " - "contain any documents.")); + "contain any documents.")); else { + size_t n_lines = strlen (documents) / 80; char buf[81]; - int i; + size_t i; tab_output_text (TAB_LEFT | TAT_TITLE, _("Documents in the active file:")); som_blank_line (); buf[80] = 0; - for (i = 0; i < default_dict.n_documents; i++) + for (i = 0; i < n_lines; i++) { int len = 79; - memcpy (buf, &default_dict.documents[i * 80], 80); + memcpy (buf, &documents[i * 80], 80); while ((isspace ((unsigned char) buf[len]) || buf[len] == 0) && len > 0) len--; @@ -364,11 +363,9 @@ display_variables (struct variable **vl, int n, int as) nr = n + 5; tab_hline (t, TAL_2, 0, nc - 1, 1); tab_text (t, 0, 0, TAB_LEFT | TAT_TITLE, _("Variable")); + pc = (as == AS_INDEX ? 1 : 3); if (as != AS_NAMES) - { - pc = (as == AS_INDEX ? 1 : 3); - tab_text (t, pc, 0, TAB_LEFT | TAT_TITLE, _("Position")); - } + tab_text (t, pc, 0, TAB_LEFT | TAT_TITLE, _("Position")); if (as == AS_DICTIONARY || as == AS_VARIABLES) tab_joint_text (t, 1, 0, 2, 0, TAB_LEFT | TAT_TITLE, _("Description")); else if (as == AS_LABELS) @@ -385,7 +382,7 @@ display_variables (struct variable **vl, int n, int as) if (as == AS_DICTIONARY || as == AS_VARIABLES) { - int nvl = v->val_lab ? avl_count (v->val_lab) : 0; + int nvl = val_labs_count (v->val_labs); if (r + 10 + nvl > nr) { @@ -522,13 +519,11 @@ describe_variable (struct variable *v, struct tab_table *t, int r, int as) } /* Value labels. */ - if (as == AS_DICTIONARY && v->val_lab) + if (as == AS_DICTIONARY && val_labs_count (v->val_labs)) { - avl_traverser trav; - struct value_label *vl; - int nvl = avl_count (v->val_lab); + struct val_labs_iterator *i; + struct val_lab *vl; int orig_r = r; - int i; #if 0 tab_text (t, 1, r, TAB_LEFT, _("Value")); @@ -537,33 +532,22 @@ describe_variable (struct variable *v, struct tab_table *t, int r, int as) #endif tab_hline (t, TAL_1, 1, 2, r); - avl_traverser_init (trav); - for (i = 1, vl = avl_traverse (v->val_lab, &trav); vl; - i++, vl = avl_traverse (v->val_lab, &trav)) - { + for (vl = val_labs_first_sorted (v->val_labs, &i); vl != NULL; + vl = val_labs_next (v->val_labs, &i)) + { char buf[128]; if (v->type == ALPHA) { - memcpy (buf, vl->v.s, v->width); + memcpy (buf, vl->value.s, v->width); buf[v->width] = 0; } else - sprintf (buf, "%g", vl->v.f); + sprintf (buf, "%g", vl->value.f); tab_text (t, 1, r, TAB_NONE, buf); - tab_text (t, 2, r, TAB_LEFT, vl->s); + tab_text (t, 2, r, TAB_LEFT, vl->label); r++; - - if (i == nvl) - break; - } - - for (;;) - { - if (vl == NULL) - break; - vl = avl_traverse (v->val_lab, &trav); } tab_vline (t, TAL_1, 2, orig_r, r - 1); @@ -576,9 +560,14 @@ describe_variable (struct variable *v, struct tab_table *t, int r, int as) } static int -compare_vectors_by_name (const void *a, const void *b) +compare_vectors_by_name (const void *a_, const void *b_) { - return strcmp ((*((struct vector **) a))->name, (*((struct vector **) b))->name); + struct vector *const *pa = a_; + struct vector *const *pb = b_; + struct vector *a = *pa; + struct vector *b = *pb; + + return strcmp (a->name, b->name); } /* Display a list of vectors. If SORTED is nonzero then they are @@ -586,10 +575,12 @@ compare_vectors_by_name (const void *a, const void *b) static void display_vectors (int sorted) { - struct vector **vl; + const struct vector **vl; int i; struct tab_table *t; - + size_t nvec; + + nvec = dict_get_vector_cnt (default_dict); if (nvec == 0) { msg (SW, _("No vectors defined.")); @@ -598,7 +589,7 @@ display_vectors (int sorted) vl = xmalloc (sizeof *vl * nvec); for (i = 0; i < nvec; i++) - vl[i] = &vec[i]; + vl[i] = dict_get_vector (default_dict, i); if (sorted) qsort (vl, nvec, sizeof *vl, compare_vectors_by_name);