/* PSPP - a program for statistical analysis.
- Copyright (C) 1997-9, 2000, 2006, 2009, 2010 Free Software Foundation, Inc.
+ Copyright (C) 1997-9, 2000, 2006, 2009, 2010, 2011 Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
#include <stdlib.h>
#include <stdio.h>
-#include <data/case.h>
-#include <data/casegrouper.h>
-#include <data/casereader.h>
-#include <data/data-out.h>
-#include <data/dictionary.h>
-#include <data/format.h>
-#include <data/procedure.h>
-#include <data/value-labels.h>
-#include <data/variable.h>
-#include <language/command.h>
-#include <language/dictionary/split-file.h>
-#include <language/lexer/lexer.h>
-#include <language/lexer/variable-parser.h>
-#include <libpspp/array.h>
-#include <libpspp/assertion.h>
-#include <libpspp/compiler.h>
-#include <libpspp/hash-functions.h>
-#include <libpspp/hmap.h>
-#include <libpspp/hmapx.h>
-#include <libpspp/message.h>
-#include <libpspp/misc.h>
-#include <libpspp/pool.h>
-#include <libpspp/str.h>
-#include <output/tab.h>
-
-#include "minmax.h"
-#include "xalloc.h"
-#include "xsize.h"
+#include "data/case.h"
+#include "data/casegrouper.h"
+#include "data/casereader.h"
+#include "data/data-out.h"
+#include "data/dataset.h"
+#include "data/dictionary.h"
+#include "data/format.h"
+#include "data/value-labels.h"
+#include "data/variable.h"
+#include "language/command.h"
+#include "language/dictionary/split-file.h"
+#include "language/lexer/lexer.h"
+#include "language/lexer/variable-parser.h"
+#include "libpspp/array.h"
+#include "libpspp/assertion.h"
+#include "libpspp/compiler.h"
+#include "libpspp/hash-functions.h"
+#include "libpspp/hmap.h"
+#include "libpspp/hmapx.h"
+#include "libpspp/message.h"
+#include "libpspp/misc.h"
+#include "libpspp/pool.h"
+#include "libpspp/str.h"
+#include "output/tab.h"
+
+#include "gl/minmax.h"
+#include "gl/xalloc.h"
+#include "gl/xsize.h"
#include "gettext.h"
#define _(msgid) gettext (msgid)
+variables=custom;
missing=miss:!table/include/report;
+write[wr_]=none,cells,all;
- +format=fmt:!labels/nolabels/novallabs,
- val:!avalue/dvalue,
+ +format=val:!avalue/dvalue,
indx:!noindex/index,
tabl:!tables/notables,
box:!box/nobox,
/* Ensure that this is a TABLES subcommand. */
if (!lex_match_id (lexer, "TABLES")
&& (lex_token (lexer) != T_ID ||
- dict_lookup_var (dataset_dict (ds), lex_tokid (lexer)) == NULL)
+ dict_lookup_var (dataset_dict (ds), lex_tokcstr (lexer)) == NULL)
&& lex_token (lexer) != T_ALL)
return 2;
lex_match (lexer, T_EQUALS);
struct string vars;
int i;
- ds_init_cstr (&vars, var_get_name (pt->vars[0]));
+ ds_init_cstr (&vars, var_to_string (pt->vars[0]));
for (i = 1; i < pt->n_vars; i++)
- ds_put_format (&vars, " * %s", var_get_name (pt->vars[i]));
+ ds_put_format (&vars, " * %s", var_to_string (pt->vars[i]));
/* TRANSLATORS: The %s here describes a crosstabulation. It takes the
form "var1 * var2 * var3 * ...". */
/* First header line. */
tab_joint_text (table, x.n_consts + 1, 0,
(x.n_consts + 1) + (x.n_cols - 1), 0,
- TAB_CENTER | TAT_TITLE, var_get_name (x.vars[COL_VAR]));
+ TAB_CENTER | TAT_TITLE, var_to_string (x.vars[COL_VAR]));
tab_hline (table, TAL_1, x.n_consts + 1,
x.n_consts + 2 + x.n_cols - 2, 1);
x.n_consts + 2 - i - 1, 1,
TAB_RIGHT | TAT_TITLE, var_to_string (x.vars[i]));
tab_text (table, x.n_consts + 2 - 2, 1, TAB_RIGHT | TAT_TITLE,
- var_get_name (x.vars[ROW_VAR]));
+ var_to_string (x.vars[ROW_VAR]));
for (i = 0; i < x.n_cols; i++)
table_value_missing (proc, table, x.n_consts + 2 + i - 1, 1, TAB_RIGHT,
&x.cols[i], x.vars[COL_VAR]);
{
if (i)
ds_put_cstr (&title, " * ");
- ds_put_cstr (&title, var_get_name (x.vars[i]));
+ ds_put_cstr (&title, var_to_string (x.vars[i]));
}
for (i = 0; i < pt->n_consts; i++)
{
const struct variable *var = pt->const_vars[i];
- size_t ofs;
- char *s = NULL;
+ char *s;
- ds_put_format (&title, ", %s=", var_get_name (var));
+ ds_put_format (&title, ", %s=", var_to_string (var));
- /* Insert the formatted value of the variable, then trim
- leading spaces in what was just inserted. */
- ofs = ds_length (&title);
+ /* Insert the formatted value of VAR without any leading spaces. */
s = data_out (&pt->const_values[i], var_get_encoding (var),
var_get_print_format (var));
- ds_put_cstr (&title, s);
+ ds_put_cstr (&title, s + strspn (s, " "));
free (s);
- ds_remove (&title, ofs, ss_cspan (ds_substr (&title, ofs, SIZE_MAX),
- ss_cstr (" ")));
}
ds_put_cstr (&title, " [");
free (s);
}
else
- tab_value (table, c, r, opt, v, proc->dict, print);
+ tab_value (table, c, r, opt, v, var, print);
}
}
calc_chisq (pt, chisq_v, df, &fisher1, &fisher2);
- tab_offset (chisq, pt->n_vars - 2, -1);
+ tab_offset (chisq, pt->n_consts + pt->n_vars - 2, -1);
for (i = 0; i < N_CHISQ; i++)
{
somers_d_v, somers_d_ase, somers_d_t))
return;
- tab_offset (sym, pt->n_vars - 2, -1);
+ tab_offset (sym, pt->n_consts + pt->n_vars - 2, -1);
for (i = 0; i < N_SYMMETRIC; i++)
{
if (!calc_risk (pt, risk_v, upper, lower, c))
return;
- tab_offset (risk, pt->n_vars - 2, -1);
+ tab_offset (risk, pt->n_consts + pt->n_vars - 2, -1);
for (i = 0; i < 3; i++)
{
case 0:
if (var_is_numeric (cv))
sprintf (buf, _("Odds Ratio for %s (%g / %g)"),
- var_get_name (cv), c[0].f, c[1].f);
+ var_to_string (cv), c[0].f, c[1].f);
else
sprintf (buf, _("Odds Ratio for %s (%.*s / %.*s)"),
- var_get_name (cv),
+ var_to_string (cv),
cvw, value_str (&c[0], cvw),
cvw, value_str (&c[1], cvw));
break;
case 2:
if (var_is_numeric (rv))
sprintf (buf, _("For cohort %s = %g"),
- var_get_name (rv), pt->rows[i - 1].f);
+ var_to_string (rv), pt->rows[i - 1].f);
else
sprintf (buf, _("For cohort %s = %.*s"),
- var_get_name (rv),
+ var_to_string (rv),
rvw, value_str (&pt->rows[i - 1], rvw));
break;
}
if (!calc_directional (proc, pt, direct_v, direct_ase, direct_t))
return;
- tab_offset (direct, pt->n_vars - 2, -1);
+ tab_offset (direct, pt->n_consts + pt->n_vars - 2, -1);
for (i = 0; i < N_DIRECTIONAL; i++)
{
if (k == 0)
string = NULL;
else if (k == 1)
- string = var_get_name (pt->vars[0]);
+ string = var_to_string (pt->vars[0]);
else
- string = var_get_name (pt->vars[1]);
+ string = var_to_string (pt->vars[1]);
tab_text_format (direct, j, 0, TAB_LEFT,
gettext (stats_names[j][k]), string);
projects / pspp / blobdiff