/* PSPP - computes sample statistics.
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
modify it under the terms of the GNU General Public License as
int first_column; /* 0-based first column. */
/* PRT_VAR only. */
- struct variable *var; /* Associated variable. */
+ const struct variable *var; /* Associated variable. */
struct fmt_spec format; /* Output spec. */
bool add_space; /* Add trailing space? */
bool sysmis_as_spaces; /* Output SYSMIS as spaces? */
}
if (trns->record_cnt != 0 && trns->record_cnt != record)
- msg (SW, _("Output calls for %d records but %d specified on RECORDS "
+ msg (SW, _("Output calls for %d records but %u specified on RECORDS "
"subcommand."),
- record, trns->record_cnt);
+ record, (unsigned int) trns->record_cnt);
trns->record_cnt = record;
return true;
int *record, int *column,
enum which_formats which_formats)
{
- struct variable **vars;
+ const struct variable **vars;
size_t var_cnt, var_idx;
struct fmt_spec *formats, *f;
size_t format_cnt;
bool add_space;
- if (!parse_variables_pool (lexer, tmp_pool, dict,
+ if (!parse_variables_const_pool (lexer, tmp_pool, dict,
&vars, &var_cnt, PV_DUPLICATE))
return false;
format_cnt = var_cnt;
for (i = 0; i < var_cnt; i++)
{
- struct variable *v = vars[i];
- formats[i] = which_formats == PRINT ? v->print : v->write;
+ const struct variable *v = vars[i];
+ formats[i] = (which_formats == PRINT
+ ? *var_get_print_format (v)
+ : *var_get_write_format (v));
}
add_space = which_formats == PRINT;
}
for (f = formats; f < &formats[format_cnt]; f++)
if (!execute_placement_format (f, record, column))
{
- struct variable *var;
+ const struct variable *var;
struct prt_out_spec *spec;
var = vars[var_idx++];
- if (!fmt_check_width_compat (f, var->width))
+ if (!fmt_check_width_compat (f, var_get_width (var)))
return false;
spec = pool_alloc (trns->pool, sizeof *spec);
filled with spaces, instead of using the normal format
that usually contains a period. */
spec->sysmis_as_spaces = (which_formats == WRITE
- && var->type == NUMERIC
+ && var_is_numeric (var)
&& (fmt_get_category (spec->format.type)
!= FMT_CAT_BINARY));
width = ds_length (&spec->string);
break;
case PRT_VAR:
- tab_text (t, 0, row, TAB_LEFT, spec->var->name);
+ tab_text (t, 0, row, TAB_LEFT, var_get_name (spec->var));
tab_text (t, 3, row, TAB_LEFT | TAB_FIX,
fmt_to_string (&spec->format, fmt_string));
width = spec->format.w;
ds_set_length (&trns->line, spec->first_column, ' ');
if (spec->type == PRT_VAR)
{
- const union value *input = case_data (c, spec->var->fv);
+ const union value *input = case_data (c, spec->var);
char *output = ds_put_uninit (&trns->line, spec->format.w);
if (!spec->sysmis_as_spaces || input->f != SYSMIS)
data_out (input, &spec->format, output);