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 <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 <libpspp/hash.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 "gettext.h"
#define _(msgid) gettext (msgid)
som_blank_line ();
if (!lex_force_match_id ("LABEL"))
return CMD_FAILURE;
- if (dict_get_label (default_dict) == NULL)
+ if (dict_get_label (dataset_dict (current_dataset)) == 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 (current_dataset)));
}
}
else
if (token != '.')
{
- if (!parse_variables (default_dict, &vl, &n, PV_NONE))
+ if (!parse_variables (dataset_dict (current_dataset), &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 (current_dataset), &vl, &n, 0);
if (as == AS_SCRATCH)
{
static void
display_documents (void)
{
- const char *documents = dict_get_documents (default_dict);
+ const char *documents = dict_get_documents (dataset_dict (current_dataset));
som_blank_line ();
if (documents == NULL)
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++ = '"';
struct tab_table *t;
size_t nvec;
- nvec = dict_get_vector_cnt (default_dict);
+ nvec = dict_get_vector_cnt (dataset_dict (current_dataset));
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 (dataset_dict (current_dataset), i);
if (sorted)
qsort (vl, nvec, sizeof *vl, compare_vectors_by_name);