projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
First step in making struct variable opaque: the boring mechanical
[pspp-builds.git]
/
src
/
language
/
expressions
/
operations.def
diff --git
a/src/language/expressions/operations.def
b/src/language/expressions/operations.def
index 85e4d6c433a01365e6c4600a79c1d836fc89ef34..5f0b938a0974a1a1e92a948d961ce7bd9cd1f523 100644
(file)
--- a/
src/language/expressions/operations.def
+++ b/
src/language/expressions/operations.def
@@
-908,7
+908,7
@@
no_opt operator VEC_ELEM_NUM (idx)
{
const struct variable *var = v->var[(int) idx - 1];
double value = case_num (c, var->fv);
{
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
{
}
else
{
@@
-932,7
+932,7
@@
absorb_miss no_opt string operator VEC_ELEM_STR (idx)
if (idx >= 1 && idx <= v->cnt)
{
struct variable *var = v->var[(int) idx - 1];
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
{
}
else
{
@@
-955,7
+955,7
@@
no_opt operator NUM_VAR ()
num_var v;
{
double d = case_num (c, v->fv);
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 ()
}
no_opt string operator STR_VAR ()
@@
-963,8
+963,8
@@
no_opt string operator STR_VAR ()
expression e;
str_var v;
{
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, v
ar_get_width (v)
);
+ memcpy (s.string, case_str (c, v->fv), v
ar_get_width (v)
);
return s;
}
return s;
}
@@
-975,7
+975,7
@@
no_opt perm_only function LAG (num_var v, pos_int n_before)
if (c != NULL)
{
double x = case_num (c, v->fv);
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;
}
else
return SYSMIS;
@@
-988,7
+988,7
@@
no_opt perm_only function LAG (num_var v)
if (c != NULL)
{
double x = case_num (c, v->fv);
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;
}
else
return SYSMIS;
@@
-1000,7
+1000,7
@@
no_opt perm_only string function LAG (str_var v, pos_int n_before)
{
struct ccase *c = lagged_case (ds, n_before);
if (c != NULL)
{
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), v
ar_get_width (v)
);
else
return empty_string;
}
else
return empty_string;
}
@@
-1011,7
+1011,7
@@
no_opt perm_only string function LAG (str_var v)
{
struct ccase *c = lagged_case (ds, 1);
if (c != NULL)
{
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), v
ar_get_width (v)
);
else
return empty_string;
}
else
return empty_string;
}