/* 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 <blp@gnu.org>.
This program is free software; you can redistribute it and/or
02110-1301, USA. */
#include <config.h>
-#include <libpspp/message.h>
+
#include <ctype.h>
#include <stdlib.h>
-#include <libpspp/array.h>
-#include <libpspp/alloc.h>
-#include <language/command.h>
+
#include <data/dictionary.h>
-#include <libpspp/message.h>
#include <data/file-handle-def.h>
-#include <libpspp/hash.h>
+#include <data/procedure.h>
+#include <data/sys-file-reader.h>
+#include <data/value-labels.h>
+#include <data/variable.h>
+#include <language/command.h>
+#include <language/data-io/file-handle.h>
#include <language/lexer/lexer.h>
+#include <language/lexer/variable-parser.h>
+#include <libpspp/alloc.h>
+#include <libpspp/array.h>
+#include <libpspp/hash.h>
#include <libpspp/magic.h>
+#include <libpspp/message.h>
+#include <libpspp/message.h>
#include <libpspp/misc.h>
-#include <output/output.h>
-#include <data/sys-file-reader.h>
#include <output/manager.h>
+#include <output/output.h>
#include <output/table.h>
-#include <data/value-labels.h>
-#include <data/variable.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);
/* 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;
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;
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);
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);
}
dict_destroy (d);
- return lex_end_of_command ();
+ return lex_end_of_command (lexer);
}
\f
/* 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;
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
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;
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;
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)
{
}
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
}
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)
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 (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);
}
&& v->print.w == v->write.w
&& v->print.d == v->write.d)
{
+ 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 (&v->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 (&v->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 (&v->write, str));
r++;
}
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))
union value value;
mv_pop_value (&mv, &value);
if (cnt++ > 0)
- cp += nsprintf (cp, "; ");
+ cp += sprintf (cp, "; ");
if (v->type == NUMERIC)
- cp += nsprintf (cp, "%g", value.f);
+ cp += sprintf (cp, "%g", value.f);
else
{
*cp++ = '"';
/* 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."));
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);
projects / pspp-builds.git / blobdiff