02110-1301, USA. */
#include <config.h>
+
#include <stdio.h>
#include <stdlib.h>
-#include "alloc.h"
-#include "command.h"
-#include "message.h"
-#include "lexer.h"
-#include "str.h"
-#include "variable.h"
-#include "debug-print.h"
+#include <data/procedure.h>
+#include <data/variable.h>
+#include <language/command.h>
+#include <language/lexer/lexer.h>
+#include <language/lexer/variable-parser.h>
+#include <libpspp/alloc.h>
+#include <libpspp/message.h>
+#include <libpspp/str.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 dataset *ds)
{
do
{
size_t i;
enum alignment align;
-
- if (!parse_variables (default_dict, &v, &nv, PV_NONE))
- return CMD_PART_SUCCESS_MAYBE;
+ if (!parse_variables (dataset_dict (ds), &v, &nv, PV_NONE))
+ return CMD_FAILURE;
if ( lex_force_match('(') )
{
It affects nothing but GUIs
*/
int
-cmd_variable_width (void)
+cmd_variable_width (struct dataset *ds)
{
do
{
size_t nv;
size_t i;
- if (!parse_variables (default_dict, &v, &nv, PV_NONE))
- return CMD_PART_SUCCESS_MAYBE;
+ if (!parse_variables (dataset_dict (ds), &v, &nv, PV_NONE))
+ return CMD_FAILURE;
if ( lex_force_match('(') )
{
/* Set variables' measurement level */
int
-cmd_variable_level (void)
+cmd_variable_level (struct dataset *ds)
{
do
{
enum measure level;
size_t i;
- if (!parse_variables (default_dict, &v, &nv, PV_NONE))
- return CMD_PART_SUCCESS_MAYBE;
+ if (!parse_variables (dataset_dict (ds), &v, &nv, PV_NONE))
+ return CMD_FAILURE;
if ( lex_force_match('(') )
{