/* PSPP - computes sample statistics.
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
02110-1301, USA. */
#include <config.h>
+
#include <stdio.h>
#include <stdlib.h>
-#include <libpspp/alloc.h>
+
+#include <data/procedure.h>
+#include <data/variable.h>
#include <language/command.h>
-#include <libpspp/message.h>
#include <language/lexer/lexer.h>
+#include <language/lexer/variable-parser.h>
+#include <libpspp/alloc.h>
+#include <libpspp/message.h>
#include <libpspp/str.h>
-#include <data/variable.h>
/* Set variables' alignment
This is the alignment for GUI display only.
It affects nothing but GUIs
*/
int
-cmd_variable_alignment (void)
+cmd_variable_alignment (struct lexer *lexer, struct dataset *ds)
{
do
{
size_t i;
enum alignment align;
-
- if (!parse_variables (default_dict, &v, &nv, PV_NONE))
+ if (!parse_variables (lexer, dataset_dict (ds), &v, &nv, PV_NONE))
return CMD_FAILURE;
- if ( lex_force_match('(') )
+ if ( lex_force_match (lexer, '(') )
{
- if ( lex_match_id("LEFT"))
+ if ( lex_match_id (lexer, "LEFT"))
align = ALIGN_LEFT;
- else if ( lex_match_id("RIGHT"))
+ else if ( lex_match_id (lexer, "RIGHT"))
align = ALIGN_RIGHT;
- else if ( lex_match_id("CENTER"))
+ else if ( lex_match_id (lexer, "CENTER"))
align = ALIGN_CENTRE;
else
{
return CMD_FAILURE;
}
- lex_force_match(')');
+ lex_force_match (lexer, ')');
}
else
{
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 (token == '/')
- lex_get ();
+ while (lex_token (lexer) == '/')
+ lex_get (lexer);
free (v);
}
- while (token != '.');
+ while (lex_token (lexer) != '.');
return CMD_SUCCESS;
}
It affects nothing but GUIs
*/
int
-cmd_variable_width (void)
+cmd_variable_width (struct lexer *lexer, struct dataset *ds)
{
do
{
size_t nv;
size_t i;
- if (!parse_variables (default_dict, &v, &nv, PV_NONE))
+ if (!parse_variables (lexer, dataset_dict (ds), &v, &nv, PV_NONE))
return CMD_FAILURE;
- if ( lex_force_match('(') )
+ if ( lex_force_match (lexer, '(') )
{
- if ( lex_force_int())
- lex_get();
+ if ( lex_force_int (lexer))
+ lex_get (lexer);
else
return CMD_FAILURE;
- lex_force_match(')');
+ lex_force_match (lexer, ')');
}
for( i = 0 ; i < nv ; ++i )
- v[i]->display_width = tokval;
+ var_set_display_width (v[i], lex_integer (lexer));
- while (token == '/')
- lex_get ();
+ while (lex_token (lexer) == '/')
+ lex_get (lexer);
free (v);
}
- while (token != '.');
+ while (lex_token (lexer) != '.');
return CMD_SUCCESS;
}
/* Set variables' measurement level */
int
-cmd_variable_level (void)
+cmd_variable_level (struct lexer *lexer, struct dataset *ds)
{
do
{
enum measure level;
size_t i;
- if (!parse_variables (default_dict, &v, &nv, PV_NONE))
+ if (!parse_variables (lexer, dataset_dict (ds), &v, &nv, PV_NONE))
return CMD_FAILURE;
- if ( lex_force_match('(') )
+ if ( lex_force_match (lexer, '(') )
{
- if ( lex_match_id("SCALE"))
+ if ( lex_match_id (lexer, "SCALE"))
level = MEASURE_SCALE;
- else if ( lex_match_id("ORDINAL"))
+ else if ( lex_match_id (lexer, "ORDINAL"))
level = MEASURE_ORDINAL;
- else if ( lex_match_id("NOMINAL"))
+ else if ( lex_match_id (lexer, "NOMINAL"))
level = MEASURE_NOMINAL;
else
{
return CMD_FAILURE;
}
- lex_force_match(')');
+ lex_force_match (lexer, ')');
}
else
{
}
for( i = 0 ; i < nv ; ++i )
- v[i]->measure = level ;
+ var_set_measure (v[i], level);
- while (token == '/')
- lex_get ();
+ while (lex_token (lexer) == '/')
+ lex_get (lexer);
free (v);
}
- while (token != '.');
+ while (lex_token (lexer) != '.');
return CMD_SUCCESS;
}