/* 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
lex_error (lexer, _("expecting number or string"));
goto done;
}
-
- if ( ds == NULL )
+
+ if ( ds == NULL )
{
- ds = create_dataset ();
+ ds = create_dataset (NULL);
d = dataset_dict (ds);
}
-
+
old_value_cnt = dict_get_next_value_idx (d);
v = dict_create_var (d, name, width);
if (v == NULL)
case_resize (c, old_value_cnt, dict_get_next_value_idx (d));
if (lex_is_number (lexer))
- case_data_rw (c, v->fv)->f = lex_tokval (lexer);
+ case_data_rw (c, v)->f = lex_tokval (lexer);
else
- memcpy (case_data_rw (c, v->fv)->s, ds_data (lex_tokstr (lexer)),
- v->width);
+ memcpy (case_data_rw (c, v)->s, ds_data (lex_tokstr (lexer)),
+ var_get_width (v));
lex_get (lexer);
if (!lex_force_match (lexer, ')'))
}
break;
case OP_variable:
- fprintf (stderr, "v<%s>", op->variable->name);
+ fprintf (stderr, "v<%s>", var_get_name (op->variable));
break;
case OP_vector:
- fprintf (stderr, "vec<%s>", op->vector->name);
+ fprintf (stderr, "vec<%s>", vector_get_name (op->vector));
break;
case OP_integer:
fprintf (stderr, "i<%d>", op->integer);