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
/
xforms
/
compute.c
diff --git
a/src/language/xforms/compute.c
b/src/language/xforms/compute.c
index a2a7e7d2a430c108cae7170888ebabea2f7fafd8..03e38c75f6f9afd0191e84d37e7fad5936fbcea0 100644
(file)
--- a/
src/language/xforms/compute.c
+++ b/
src/language/xforms/compute.c
@@
-206,7
+206,7
@@
compute_str_vec (void *compute_, struct ccase *c, casenumber case_num)
vr = compute->vector->var[rindx - 1];
expr_evaluate_str (compute->rvalue, c, case_num,
vr = compute->vector->var[rindx - 1];
expr_evaluate_str (compute->rvalue, c, case_num,
- case_data_rw (c, vr->fv)->s, v
r->width
);
+ case_data_rw (c, vr->fv)->s, v
ar_get_width (vr)
);
}
return TRNS_CONTINUE;
}
return TRNS_CONTINUE;
@@
-379,8
+379,8
@@
static int
lvalue_get_type (const struct lvalue *lvalue)
{
return (lvalue->variable != NULL
lvalue_get_type (const struct lvalue *lvalue)
{
return (lvalue->variable != NULL
- ?
lvalue->variable->type
- :
lvalue->vector->var[0]->type
);
+ ?
var_get_type (lvalue->variable)
+ :
var_get_type (lvalue->vector->var[0])
);
}
/* Returns true if LVALUE has a vector as its target. */
}
/* Returns true if LVALUE has a vector as its target. */
@@
-401,10
+401,10
@@
lvalue_finalize (struct lvalue *lvalue,
{
compute->variable = lvalue->variable;
compute->fv = compute->variable->fv;
{
compute->variable = lvalue->variable;
compute->fv = compute->variable->fv;
- compute->width =
compute->variable->width
;
+ compute->width =
var_get_width (compute->variable)
;
/* Goofy behavior, but compatible: Turn off LEAVE. */
/* Goofy behavior, but compatible: Turn off LEAVE. */
- if (dict_class_from_id (
compute->variable->name
) != DC_SCRATCH)
+ if (dict_class_from_id (
var_get_name (compute->variable)
) != DC_SCRATCH)
compute->variable->leave = false;
/* Prevent lvalue_destroy from deleting variable. */
compute->variable->leave = false;
/* Prevent lvalue_destroy from deleting variable. */