#include <data/dictionary.h>
#include <data/file-handle-def.h>
+#include <data/format.h>
+#include <data/missing-values.h>
#include <data/procedure.h>
#include <data/sys-file-reader.h>
#include <data/value-labels.h>
#include <data/variable.h>
+#include <data/vector.h>
#include <language/command.h>
#include <language/data-io/file-handle.h>
#include <language/lexer/lexer.h>
#include <output/output.h>
#include <output/table.h>
+#include "minmax.h"
+
#include "gettext.h"
#define _(msgid) gettext (msgid)
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);
{
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,
for (r = 1, i = 0; i < dict_get_var_cnt (d); i++)
{
struct variable *v = dict_get_var (d, i);
- const int nvl = val_labs_count (v->val_labs);
+ const int nvl = val_labs_count (var_get_value_labels (v));
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);
}
sorted = lex_match_id (lexer, "SORTED");
for (cp = sbc; *cp; cp++)
- if (lex_token (lexer) == T_ID && lex_id_match (*cp, lex_tokid (lexer)))
+ if (lex_token (lexer) == T_ID
+ && lex_id_match (ss_cstr (*cp), ss_cstr (lex_tokid (lexer))))
{
lex_get (lexer);
break;
{
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--;
}
if (sorted)
- sort (vl, n, sizeof *vl, compare_var_ptr_names, NULL);
+ sort (vl, n, sizeof *vl, compare_var_ptrs_by_name, NULL);
display_variables (vl, n, as);
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;
if (as == AS_DICTIONARY || as == AS_VARIABLES)
{
- int nvl = val_labs_count (v->val_labs);
+ int nvl = val_labs_count (var_get_value_labels (v));
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);
+ tab_text (t, pc, r, TAT_PRINTF, "%d",
+ (int) var_get_dict_index (v) + 1);
tab_hline (t, TAL_1, 0, nc - 1, r);
}
r++;
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, 3, r, TAT_PRINTF, "%d", v->index + 1);
+ tab_text (t, 0, r, TAB_LEFT, var_get_name (v));
+ tab_text (t, 3, r, TAT_PRINTF, "%d", (int) var_get_dict_index (v) + 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, str));
+ 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, str));
+ _("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, str));
+ _("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;
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_value (&mv, &value);
if (cnt++ > 0)
cp += sprintf (cp, "; ");
- if (v->type == NUMERIC)
+ 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';
}
}
/* Value labels. */
- if (as == AS_DICTIONARY && val_labs_count (v->val_labs))
+ if (as == AS_DICTIONARY && var_has_value_labels (v))
{
+ const struct val_labs *val_labs = var_get_value_labels (v);
struct val_labs_iterator *i;
struct val_lab *vl;
int orig_r = r;
#endif
tab_hline (t, TAL_1, 1, 2, r);
- for (vl = val_labs_first_sorted (v->val_labs, &i); vl != NULL;
- vl = val_labs_next (v->val_labs, &i))
+ for (vl = val_labs_first_sorted (val_labs, &i); vl != NULL;
+ vl = val_labs_next (val_labs, &i))
{
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);
return r;
}
-static int
-compare_vectors_by_name (const void *a_, const void *b_)
-{
- struct vector *const *pa = a_;
- struct vector *const *pb = b_;
- struct vector *a = *pa;
- struct vector *b = *pb;
-
- return strcasecmp (a->name, b->name);
-}
-
/* Display a list of vectors. If SORTED is nonzero then they are
sorted alphabetically. */
static void
for (i = 0; i < nvec; i++)
vl[i] = dict_get_vector (dict, i);
if (sorted)
- qsort (vl, nvec, sizeof *vl, compare_vectors_by_name);
+ qsort (vl, nvec, sizeof *vl, compare_vector_ptrs_by_name);
t = tab_create (1, nvec + 1, 0);
tab_headers (t, 0, 0, 1, 0);
tab_text (t, 0, 0, TAT_TITLE | TAB_LEFT, _("Vector"));
tab_flags (t, SOMF_NO_TITLE);
for (i = 0; i < nvec; i++)
- tab_text (t, 0, i + 1, TAB_LEFT, vl[i]->name);
+ tab_text (t, 0, i + 1, TAB_LEFT, vector_get_name (vl[i]));
tab_submit (t);
free (vl);
projects / pspp-builds.git / blobdiff