if (compute->rvalue == NULL)
goto fail;
- add_transformation (get_proc_func (lvalue), compute_trns_free, compute);
+ add_transformation (current_dataset,
+ get_proc_func (lvalue), compute_trns_free, compute);
lvalue_finalize (lvalue, compute);
compute = compute_trns_create ();
/* Test expression. */
- compute->test = expr_parse (default_dict, EXPR_BOOLEAN);
+ compute->test = expr_parse (dataset_dict (current_dataset), EXPR_BOOLEAN);
if (compute->test == NULL)
goto fail;
if (compute->rvalue == NULL)
goto fail;
- add_transformation (get_proc_func (lvalue), compute_trns_free, compute);
+ add_transformation (current_dataset,
+ get_proc_func (lvalue), compute_trns_free, compute);
lvalue_finalize (lvalue, compute);
{
bool is_numeric = lvalue_get_type (lvalue) == NUMERIC;
- return expr_parse (default_dict, is_numeric ? EXPR_NUMBER : EXPR_STRING);
+ return expr_parse (dataset_dict (current_dataset), is_numeric ? EXPR_NUMBER : EXPR_STRING);
}
/* Returns a new struct compute_trns after initializing its fields. */
if (lex_look_ahead () == '(')
{
/* Vector. */
- lvalue->vector = dict_lookup_vector (default_dict, tokid);
+ lvalue->vector = dict_lookup_vector (dataset_dict (current_dataset), tokid);
if (lvalue->vector == NULL)
{
msg (SE, _("There is no vector named %s."), tokid);
lex_get ();
if (!lex_force_match ('('))
goto lossage;
- lvalue->element = expr_parse (default_dict, EXPR_NUMBER);
+ lvalue->element = expr_parse (dataset_dict (current_dataset), EXPR_NUMBER);
if (lvalue->element == NULL)
goto lossage;
if (!lex_force_match (')'))
{
if (lvalue->vector == NULL)
{
- struct variable *var = dict_lookup_var (default_dict, lvalue->var_name);
+ struct variable *var = dict_lookup_var (dataset_dict (current_dataset), lvalue->var_name);
if (var == NULL)
return NUMERIC;
else
{
if (lvalue->vector == NULL)
{
- compute->variable = dict_lookup_var (default_dict, lvalue->var_name);
+ compute->variable = dict_lookup_var (dataset_dict (current_dataset), lvalue->var_name);
if (compute->variable == NULL)
- compute->variable = dict_create_var_assert (default_dict,
+ compute->variable = dict_create_var_assert (dataset_dict (current_dataset),
lvalue->var_name, 0);
compute->fv = compute->variable->fv;