#endif
static size_t case_size (const struct caseproto *);
-static bool variable_matches_case (const struct ccase *,
+static void assert_variable_matches_case (const struct ccase *,
const struct variable *);
static void copy_forward (struct ccase *dst, size_t dst_idx,
const struct ccase *src, size_t src_idx,
{
/* FIXME: improve approximation? */
return (1 + caseproto_get_n_widths (proto)
- + 3 * caseproto_get_n_long_strings (proto)) * sizeof (union value);
+ + 3 * caseproto_get_n_strings (proto)) * sizeof (union value);
}
/* Changes the prototype for case C, which must not be shared.
if (dst != src)
{
- if (!dst->proto->n_long_strings || !src->proto->n_long_strings)
+ if (!dst->proto->n_strings || !src->proto->n_strings)
memcpy (&dst->values[dst_idx], &src->values[src_idx],
sizeof dst->values[0] * n_values);
else
}
else if (dst_idx != src_idx)
{
- if (!dst->proto->n_long_strings)
+ if (!dst->proto->n_strings)
memmove (&dst->values[dst_idx], &src->values[src_idx],
sizeof dst->values[0] * n_values);
else if (dst_idx < src_idx)
const union value *
case_data (const struct ccase *c, const struct variable *v)
{
- assert (variable_matches_case (c, v));
+ assert_variable_matches_case (c, v);
return &c->values[var_get_case_index (v)];
}
union value *
case_data_rw (struct ccase *c, const struct variable *v)
{
- assert (variable_matches_case (c, v));
+ assert_variable_matches_case (c, v);
assert (!case_is_shared (c));
return &c->values[var_get_case_index (v)];
}
double
case_num (const struct ccase *c, const struct variable *v)
{
- assert (variable_matches_case (c, v));
+ assert_variable_matches_case (c, v);
return c->values[var_get_case_index (v)].f;
}
const uint8_t *
case_str (const struct ccase *c, const struct variable *v)
{
- size_t idx = var_get_case_index (v);
- assert (variable_matches_case (c, v));
- return value_str (&c->values[idx], caseproto_get_width (c->proto, idx));
+ assert_variable_matches_case (c, v);
+ return c->values[var_get_case_index (v)].s;
}
/* Returns the string value of the `union value' in C numbered
case_str_idx (const struct ccase *c, size_t idx)
{
assert (idx < c->proto->n_widths);
- return value_str (&c->values[idx], caseproto_get_width (c->proto, idx));
+ return c->values[idx].s;
}
/* Returns the string value of the `union value' in C for
uint8_t *
case_str_rw (struct ccase *c, const struct variable *v)
{
+ assert_variable_matches_case (c, v);
size_t idx = var_get_case_index (v);
- assert (variable_matches_case (c, v));
assert (!case_is_shared (c));
- return value_str_rw (&c->values[idx], caseproto_get_width (c->proto, idx));
+ return c->values[idx].s;
}
/* Returns the string value of the `union value' in C numbered
{
assert (idx < c->proto->n_widths);
assert (!case_is_shared (c));
- return value_str_rw (&c->values[idx], caseproto_get_width (c->proto, idx));
+ return c->values[idx].s;
}
/* Compares the values of the N_VARS variables in VP
or write data in C.
Useful in assertions. */
-static bool UNUSED
-variable_matches_case (const struct ccase *c, const struct variable *v)
+static void
+assert_variable_matches_case (const struct ccase *c, const struct variable *v)
{
size_t case_idx = var_get_case_index (v);
- return (case_idx < caseproto_get_n_widths (c->proto)
- && caseproto_get_width (c->proto, case_idx) == var_get_width (v));
+ assert (case_idx < caseproto_get_n_widths (c->proto));
+ assert (caseproto_get_width (c->proto, case_idx) == var_get_width (v));
}
/* Internal helper function for case_copy(). */