-/* PSPP - computes sample statistics.
+/* PSPP - a program for statistical analysis.
Copyright (C) 1997-9, 2000 Free Software Foundation, Inc.
- Written by John Darrington <john@darrington.wattle.id.au>
- 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 the Free Software Foundation; either version 2 of the
- License, or (at your option) any later version.
+ 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
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
- This program is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- 02110-1301, USA. */
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include <config.h>
if (!parse_variables (lexer, dataset_dict (ds), &v, &nv, PV_NONE))
return CMD_FAILURE;
- if ( lex_force_match (lexer, '(') )
+ if ( lex_force_match (lexer, '(') )
{
if ( lex_match_id (lexer, "LEFT"))
align = ALIGN_LEFT;
align = ALIGN_RIGHT;
else if ( lex_match_id (lexer, "CENTER"))
align = ALIGN_CENTRE;
- else
+ else
{
free (v);
- return CMD_FAILURE;
+ return CMD_FAILURE;
}
lex_force_match (lexer, ')');
}
- else
+ else
{
free (v);
- return CMD_FAILURE;
+ return CMD_FAILURE;
}
- for( i = 0 ; i < nv ; ++i )
- v[i]->alignment = align;
-
+ for( i = 0 ; i < nv ; ++i )
+ var_set_alignment (v[i], align);
while (lex_token (lexer) == '/')
lex_get (lexer);
if (!parse_variables (lexer, dataset_dict (ds), &v, &nv, PV_NONE))
return CMD_FAILURE;
- if ( lex_force_match (lexer, '(') )
+ if ( lex_force_match (lexer, '(') )
{
- if ( lex_force_int (lexer))
+ if ( lex_force_int (lexer))
lex_get (lexer);
else
return CMD_FAILURE;
lex_force_match (lexer, ')');
}
- for( i = 0 ; i < nv ; ++i )
- v[i]->display_width = lex_tokval (lexer);
+ for( i = 0 ; i < nv ; ++i )
+ var_set_display_width (v[i], lex_integer (lexer));
while (lex_token (lexer) == '/')
lex_get (lexer);
if (!parse_variables (lexer, dataset_dict (ds), &v, &nv, PV_NONE))
return CMD_FAILURE;
- if ( lex_force_match (lexer, '(') )
+ if ( lex_force_match (lexer, '(') )
{
if ( lex_match_id (lexer, "SCALE"))
level = MEASURE_SCALE;
level = MEASURE_ORDINAL;
else if ( lex_match_id (lexer, "NOMINAL"))
level = MEASURE_NOMINAL;
- else
+ else
{
free (v);
- return CMD_FAILURE;
+ return CMD_FAILURE;
}
lex_force_match (lexer, ')');
else
{
free (v);
- return CMD_FAILURE;
+ return CMD_FAILURE;
}
-
- for( i = 0 ; i < nv ; ++i )
- v[i]->measure = level ;
+
+ for( i = 0 ; i < nv ; ++i )
+ var_set_measure (v[i], level);
while (lex_token (lexer) == '/')