const struct variable **dst_vars; /* Destination variables. */
const struct dictionary *dst_dict; /* Dictionary of dst_vars */
char **dst_names; /* Name of dest variables, if they're new. */
- size_t var_cnt; /* Number of variables. */
+ size_t n_vars; /* Number of variables. */
/* Mappings. */
struct mapping *mappings; /* Value mappings. */
- size_t map_cnt; /* Number of mappings. */
+ size_t n_maps; /* Number of mappings. */
int max_src_width; /* Maximum width of src_vars[*]. */
int max_dst_width; /* Maximum width of any map_out in mappings. */
};
static void set_map_out_str (struct map_out *, struct pool *,
struct substring);
-static void enlarge_dst_widths (struct recode_trns *);
+static bool enlarge_dst_widths (struct recode_trns *);
static void create_dst_vars (struct recode_trns *, struct dictionary *);
static trns_proc_func recode_trns_proc;
/* Ensure that all the output strings are at least as wide
as the widest destination variable. */
if (trns->dst_type == VAL_STRING)
- enlarge_dst_widths (trns);
+ {
+ if (! enlarge_dst_widths (trns))
+ {
+ recode_trns_free (trns);
+ return CMD_FAILURE;
+ }
+ }
/* Create destination variables, if needed.
This must be the final step; otherwise we'd have to
}
/* Parses a set of variables to recode into TRNS->src_vars and
- TRNS->var_cnt. Sets TRNS->src_type. Returns true if
+ TRNS->n_vars. Sets TRNS->src_type. Returns true if
successful, false on parse error. */
static bool
parse_src_vars (struct lexer *lexer,
struct recode_trns *trns, const struct dictionary *dict)
{
- if (!parse_variables_const (lexer, dict, &trns->src_vars, &trns->var_cnt,
+ if (!parse_variables_const (lexer, dict, &trns->src_vars, &trns->n_vars,
PV_SAME_TYPE))
return false;
pool_register (trns->pool, free, trns->src_vars);
}
/* Parses a set of mappings, which take the form (input=output),
- into TRNS->mappings and TRNS->map_cnt. Sets TRNS->dst_type.
+ into TRNS->mappings and TRNS->n_maps. Sets TRNS->dst_type.
Returns true if successful, false on parse error. */
static bool
parse_mappings (struct lexer *lexer, struct recode_trns *trns,
/* Find length of longest source variable. */
trns->max_src_width = var_get_width (trns->src_vars[0]);
- for (i = 1; i < trns->var_cnt; i++)
+ for (i = 1; i < trns->n_vars; i++)
{
size_t var_width = var_get_width (trns->src_vars[i]);
if (var_width > trns->max_src_width)
/* Parse the mappings in parentheses. */
trns->mappings = NULL;
- trns->map_cnt = 0;
+ trns->n_maps = 0;
map_allocated = 0;
have_dst_type = false;
if (!lex_force_match (lexer, T_LPAREN))
size_t first_map_idx;
size_t i;
- first_map_idx = trns->map_cnt;
+ first_map_idx = trns->n_maps;
/* Parse source specifications. */
do
return false;
}
- for (i = first_map_idx; i < trns->map_cnt; i++)
+ for (i = first_map_idx; i < trns->n_maps; i++)
trns->mappings[i].out = out;
}
else
struct map_in in;
set_map_in_generic (&in, MAP_CONVERT);
add_mapping (trns, &map_allocated, &in);
- set_map_out_num (&trns->mappings[trns->map_cnt - 1].out, 0.0);
+ set_map_out_num (&trns->mappings[trns->n_maps - 1].out, 0.0);
dst_type = VAL_NUMERIC;
if (trns->src_type != VAL_STRING
set_map_in_generic (in, MAP_MISSING);
else if (!lex_force_string (lexer))
return false;
- else
+ else
{
set_map_in_str (in, pool, lex_tokss (lexer), max_src_width,
dict_encoding);
if (lex_token (lexer) == T_ID
&& lex_id_match (ss_cstr ("THRU"), lex_tokss (lexer)))
{
- msg (SE, _("THRU is not allowed with string variables."));
+ msg (SE, _("%s is not allowed with string variables."), "THRU");
return false;
}
}
size_t *map_allocated, const struct map_in *in)
{
struct mapping *m;
- if (trns->map_cnt >= *map_allocated)
+ if (trns->n_maps >= *map_allocated)
trns->mappings = pool_2nrealloc (trns->pool, trns->mappings,
map_allocated,
sizeof *trns->mappings);
- m = &trns->mappings[trns->map_cnt++];
+ m = &trns->mappings[trns->n_maps++];
m->in = *in;
}
set_map_out_str (out, pool, lex_tokss (lexer));
lex_get (lexer);
}
- else if (lex_match_id (lexer, "COPY"))
+ else if (lex_match_id (lexer, "COPY"))
{
out->copy_input = true;
- out->width = 0;
+ out->width = 0;
}
else
{
out->copy_input = false;
value_init_pool (pool, &out->value, length);
- memcpy (value_str_rw (&out->value, length), string, length);
+ memcpy (out->value.s, string, length);
out->width = length;
}
if (lex_match_id (lexer, "INTO"))
{
- size_t name_cnt;
+ size_t n_names;
size_t i;
if (!parse_mixed_vars_pool (lexer, dict, trns->pool,
- &trns->dst_names, &name_cnt,
+ &trns->dst_names, &n_names,
PV_NONE))
return false;
- if (name_cnt != trns->var_cnt)
+ if (n_names != trns->n_vars)
{
msg (SE, _("%zu variable(s) cannot be recoded into "
"%zu variable(s). Specify the same number "
"of variables as source and target variables."),
- trns->var_cnt, name_cnt);
+ trns->n_vars, n_names);
return false;
}
trns->dst_vars = pool_nalloc (trns->pool,
- trns->var_cnt, sizeof *trns->dst_vars);
- for (i = 0; i < trns->var_cnt; i++)
+ trns->n_vars, sizeof *trns->dst_vars);
+ for (i = 0; i < trns->n_vars; i++)
{
const struct variable *v;
v = trns->dst_vars[i] = dict_lookup_var (dict, trns->dst_names[i]);
}
}
- for (i = 0; i < trns->var_cnt; i++)
+ for (i = 0; i < trns->n_vars; i++)
{
const struct variable *v = trns->dst_vars[i];
if (v != NULL && var_get_type (v) != trns->dst_type)
/* Ensures that all the output values in TRNS are as wide as the
widest destination variable. */
-static void
+static bool
enlarge_dst_widths (struct recode_trns *trns)
{
size_t i;
-
+ const struct variable *narrow_var = NULL;
+ int min_dst_width = INT_MAX;
trns->max_dst_width = 0;
- for (i = 0; i < trns->var_cnt; i++)
+
+ for (i = 0; i < trns->n_vars; i++)
{
const struct variable *v = trns->dst_vars[i];
if (var_get_width (v) > trns->max_dst_width)
trns->max_dst_width = var_get_width (v);
+
+ if (var_get_width (v) < min_dst_width)
+ {
+ min_dst_width = var_get_width (v);
+ narrow_var = v;
+ }
}
- for (i = 0; i < trns->map_cnt; i++)
+ for (i = 0; i < trns->n_maps; i++)
{
struct map_out *out = &trns->mappings[i].out;
if (!out->copy_input)
- value_resize_pool (trns->pool, &out->value,
- out->width, trns->max_dst_width);
+ {
+ if (out->width > min_dst_width)
+ {
+ msg (ME,
+ _("Cannot recode because the variable %s would require a width of %d bytes or greater, but it has a width of only %d bytes."),
+ var_get_name (narrow_var), out->width, min_dst_width);
+ return false;
+ }
+
+ value_resize_pool (trns->pool, &out->value,
+ out->width, trns->max_dst_width);
+ }
}
+
+ return true;
}
/* Creates destination variables that don't already exist. */
{
size_t i;
- for (i = 0; i < trns->var_cnt; i++)
+ for (i = 0; i < trns->n_vars; i++)
{
const struct variable **var = &trns->dst_vars[i];
const char *name = trns->dst_names[i];
{
struct mapping *m;
- for (m = trns->mappings; m < trns->mappings + trns->map_cnt; m++)
+ for (m = trns->mappings; m < trns->mappings + trns->n_maps; m++)
{
const struct map_in *in = &m->in;
const struct map_out *out = &m->out;
int width = var_get_width (src_var);
struct mapping *m;
- for (m = trns->mappings; m < trns->mappings + trns->map_cnt; m++)
+ for (m = trns->mappings; m < trns->mappings + trns->n_maps; m++)
{
const struct map_in *in = &m->in;
struct map_out *out = &m->out;
switch (in->type)
{
case MAP_SINGLE:
- match = !memcmp (value, value_str (&in->x, trns->max_src_width),
- width);
+ match = !memcmp (value, in->x.s, width);
break;
case MAP_ELSE:
match = true;
char *error;
error = data_in (ss_buffer (CHAR_CAST_BUG (char *, value), width),
- C_ENCODING, FMT_F, &uv, 0, encoding);
+ C_ENCODING, FMT_F, settings_get_fmt_settings (),
+ &uv, 0, encoding);
match = error == NULL;
free (error);
size_t i;
*c = case_unshare (*c);
- for (i = 0; i < trns->var_cnt; i++)
+ for (i = 0; i < trns->n_vars; i++)
{
const struct variable *src_var = trns->src_vars[i];
const struct variable *dst_var = trns->dst_vars[i];
if (trns->dst_type == VAL_NUMERIC)
{
- double *dst = &case_data_rw (*c, dst_var)->f;
+ double *dst = case_num_rw (*c, dst_var);
if (out != NULL)
*dst = !out->copy_input ? out->value.f : case_num (*c, src_var);
else if (trns->src_vars != trns->dst_vars)
if (out != NULL)
{
if (!out->copy_input)
- memcpy (dst, value_str (&out->value, trns->max_dst_width),
- var_get_width (dst_var));
+ memcpy (dst, out->value.s, var_get_width (dst_var));
else if (trns->src_vars != trns->dst_vars)
{
union value *dst_data = case_data_rw (*c, dst_var);