function NUMBER (string s, ni_format f)
{
- struct data_in di;
union value out;
- di.s = s.string;
- di.v = &out;
- di.flags = DI_IMPLIED_DECIMALS;
- di.f1 = 1;
- di.format = *f;
- di.e = s.string + min (s.length, di.format.w);
- data_in (&di);
+ data_in (ss_head (s, f->w), f->type, f->d, 0, &out, 0);
return out.f;
}
v.f = x;
dst = alloc_string (e, f->w);
assert (!fmt_is_string (f->type));
- data_out (dst.string, f, &v);
+ data_out (&v, f, dst.string);
return dst;
}
{
const struct variable *var = v->var[(int) idx - 1];
double value = case_num (c, var->fv);
- return !mv_is_num_user_missing (&var->miss, value) ? value : SYSMIS;
+ return !var_is_num_user_missing (var, value) ? value : SYSMIS;
}
else
{
if (idx >= 1 && idx <= v->cnt)
{
struct variable *var = v->var[(int) idx - 1];
- return copy_string (e, case_str (c, var->fv), var->width);
+ return copy_string (e, case_str (c, var->fv), var_get_width (var));
}
else
{
num_var v;
{
double d = case_num (c, v->fv);
- return !mv_is_num_user_missing (&v->miss, d) ? d : SYSMIS;
+ return !var_is_num_user_missing (v, d) ? d : SYSMIS;
}
no_opt string operator STR_VAR ()
expression e;
str_var v;
{
- struct substring s = alloc_string (e, v->width);
- memcpy (s.string, case_str (c, v->fv), v->width);
+ struct substring s = alloc_string (e, var_get_width (v));
+ memcpy (s.string, case_str (c, v->fv), var_get_width (v));
return s;
}
if (c != NULL)
{
double x = case_num (c, v->fv);
- return !mv_is_num_user_missing (&v->miss, x) ? x : SYSMIS;
+ return !var_is_num_user_missing (v, x) ? x : SYSMIS;
}
else
return SYSMIS;
if (c != NULL)
{
double x = case_num (c, v->fv);
- return !mv_is_num_user_missing (&v->miss, x) ? x : SYSMIS;
+ return !var_is_num_user_missing (v, x) ? x : SYSMIS;
}
else
return SYSMIS;
{
struct ccase *c = lagged_case (ds, n_before);
if (c != NULL)
- return copy_string (e, case_str (c, v->fv), v->width);
+ return copy_string (e, case_str (c, v->fv), var_get_width (v));
else
return empty_string;
}
{
struct ccase *c = lagged_case (ds, 1);
if (c != NULL)
- return copy_string (e, case_str (c, v->fv), v->width);
+ return copy_string (e, case_str (c, v->fv), var_get_width (v));
else
return empty_string;
}