X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fstats%2Fautorecode.c;h=7c1b766750fb4319218c34a7ff8a30f47e9cc6fe;hb=5f86425ef29d236118667470f2a461818d7e55b2;hp=95fb8d173c5661f3a79e06b948457510a8d9e0da;hpb=38980bbfac573dcefe25021e0d9ff8a6894372ca;p=pspp diff --git a/src/language/stats/autorecode.c b/src/language/stats/autorecode.c index 95fb8d173c..7c1b766750 100644 --- a/src/language/stats/autorecode.c +++ b/src/language/stats/autorecode.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 1997-9, 2000, 2009, 2010, 2012 Free Software Foundation, Inc. + Copyright (C) 1997-9, 2000, 2009, 2010, 2012, 2013 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -37,9 +37,10 @@ #include "libpspp/str.h" #include "gl/xalloc.h" -#include "gl/vasnprintf.h" +#include "gl/c-xvasprintf.h" #include "gl/mbiter.h" + #include "gettext.h" #define _(msgid) gettext (msgid) @@ -58,7 +59,8 @@ struct arc_item /* Explains how to recode an AUTORECODE variable. */ struct arc_spec { - const struct variable *src; /* Source variable. */ + int width; /* Variable width. */ + int src_idx; /* Case index of source variable. */ struct variable *dst; /* Target variable. */ struct rec_items *items; }; @@ -88,7 +90,6 @@ struct autorecode_pgm struct rec_items *global_items; bool blank_valid; - const struct dictionary *dict; }; static trns_proc_func autorecode_trns_proc; @@ -144,18 +145,17 @@ cmd_autorecode (struct lexer *lexer, struct dataset *ds) /* Create procedure. */ arc = xzalloc (sizeof *arc); arc->blank_valid = true; - arc->dict = dataset_dict (ds); /* Parse variable lists. */ lex_match_id (lexer, "VARIABLES"); lex_match (lexer, T_EQUALS); - if (!parse_variables_const (lexer, arc->dict, &src_vars, &n_srcs, - PV_NO_DUPLICATE)) + if (!parse_variables_const (lexer, dict, &src_vars, &n_srcs, + PV_NO_DUPLICATE | PV_NO_SCRATCH)) goto error; if (!lex_force_match_id (lexer, "INTO")) goto error; lex_match (lexer, T_EQUALS); - if (!parse_DATA_LIST_vars (lexer, arc->dict, &dst_names, &n_dsts, + if (!parse_DATA_LIST_vars (lexer, dict, &dst_names, &n_dsts, PV_NO_DUPLICATE)) goto error; if (n_dsts != n_srcs) @@ -170,7 +170,7 @@ cmd_autorecode (struct lexer *lexer, struct dataset *ds) { const char *name = dst_names[i]; - if (dict_lookup_var (arc->dict, name) != NULL) + if (dict_lookup_var (dict, name) != NULL) { msg (SE, _("Target variable %s duplicates existing variable %s."), name, name); @@ -225,7 +225,8 @@ cmd_autorecode (struct lexer *lexer, struct dataset *ds) { struct arc_spec *spec = &arc->specs[i]; - spec->src = src_vars[i]; + spec->width = var_get_width (src_vars[i]); + spec->src_idx = var_get_case_index (src_vars[i]); if (arc->global_items) { @@ -247,15 +248,17 @@ cmd_autorecode (struct lexer *lexer, struct dataset *ds) for (i = 0; i < arc->n_specs; i++) { struct arc_spec *spec = &arc->specs[i]; - int width = var_get_width (spec->src); - const union value *value = case_data (c, spec->src); + int width = spec->width; + const union value *value = case_data_idx (c, spec->src_idx); size_t hash = value_hash (value, width, 0); struct arc_item *item; item = find_arc_item (spec, value, hash); if ( (item == NULL) && - ( arc->blank_valid || var_is_numeric (spec->src) || ! value_is_blank (value, width, arc->dict)) + ( arc->blank_valid + || val_type_from_width (spec->width) == VAL_NUMERIC + || ! value_is_blank (value, width, dict)) ) { item = xmalloc (sizeof *item); @@ -267,6 +270,10 @@ cmd_autorecode (struct lexer *lexer, struct dataset *ds) ok = casereader_destroy (input); ok = proc_commit (ds) && ok; + /* Re-fetch dictionary because it might have changed (if TEMPORARY was in + use). */ + dict = dataset_dict (ds); + /* Create transformation. */ for (i = 0; i < arc->n_specs; i++) { @@ -295,11 +302,11 @@ cmd_autorecode (struct lexer *lexer, struct dataset *ds) for (j = 0; j < n_items; j++) { const union value *from = &items[j]->from; - size_t len; char *recoded_value = NULL; - char *c; const int src_width = items[j]->width; union value to_val; + size_t len; + value_init (&to_val, 0); items[j]->to = direction == ASCENDING ? j + 1 : n_items - j; @@ -312,18 +319,16 @@ cmd_autorecode (struct lexer *lexer, struct dataset *ds) { const char *str = CHAR_CAST_BUG (const char*, value_str (from, src_width)); - recoded_value = recode_string (UTF8, dict_get_encoding (arc->dict), str, src_width); + recoded_value = recode_string (UTF8, dict_get_encoding (dict), + str, src_width); } else - recoded_value = asnprintf (NULL, &len, "%g", from->f); + recoded_value = c_xasprintf ("%g", from->f); /* Remove trailing whitespace */ - for (c = recoded_value; *c != '\0'; c++) - if ( *c == ' ') - { - *c = '\0'; - break; - } + len = strlen (recoded_value); + while (len > 0 && recoded_value[len - 1] == ' ') + recoded_value[--len] = '\0'; var_add_value_label (spec->dst, &to_val, recoded_value); value_destroy (&to_val, 0); @@ -401,7 +406,7 @@ find_arc_item (const struct arc_spec *spec, const union value *value, struct arc_item *item; HMAP_FOR_EACH_WITH_HASH (item, struct arc_item, hmap_node, hash, &spec->items->ht) - if (value_equal (value, &item->from, var_get_width (spec->src))) + if (value_equal (value, &item->from, spec->width)) return item; return NULL; } @@ -438,9 +443,9 @@ autorecode_trns_proc (void *arc_, struct ccase **c, for (i = 0; i < arc->n_specs; i++) { const struct arc_spec *spec = &arc->specs[i]; - int width = var_get_width (spec->src); - const union value *value = case_data (*c, spec->src); - const struct arc_item *item = find_arc_item (spec, value, value_hash (value, width, 0)); + const union value *value = case_data_idx (*c, spec->src_idx); + unsigned int hash = value_hash (value, spec->width, 0); + const struct arc_item *item = find_arc_item (spec, value, hash); case_data_rw (*c, spec->dst)->f = item ? item->to : SYSMIS; }