X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Flanguage%2Fxforms%2Frecode.c;h=dfd8145ef59fc523252fbb15b04bb194f847f447;hb=0fa141762183890ebd139ccd9264f08db9011539;hp=c9cb203961071d556cbb2a279838fe42f36e8bb0;hpb=b0bf9b1b0f727fafac4296a048e3f45db5936f81;p=pspp-builds.git diff --git a/src/language/xforms/recode.c b/src/language/xforms/recode.c index c9cb2039..dfd8145e 100644 --- a/src/language/xforms/recode.c +++ b/src/language/xforms/recode.c @@ -26,13 +26,15 @@ #include #include #include -#include +#include #include #include #include #include +#include #include #include +#include #include #include #include @@ -56,18 +58,25 @@ enum map_in_type MAP_CONVERT /* "123" => 123. */ }; +/* A value involved in a RECODE mapping. */ +union recode_value + { + double f; /* Numeric. */ + char *c; /* Short or long string. */ + }; + /* Describes input values to be mapped. */ struct map_in { enum map_in_type type; /* One of MAP_*. */ - union value x, y; /* Source values. */ + union recode_value x, y; /* Source values. */ }; /* Describes the value used as output from a mapping. */ struct map_out { bool copy_input; /* If true, copy input to output. */ - union value value; /* If copy_input false, recoded value. */ + union recode_value value; /* If copy_input false, recoded value. */ int width; /* If copy_input false, output value width. */ }; @@ -99,27 +108,27 @@ struct recode_trns size_t map_cnt; /* Number of mappings. */ }; -static bool parse_src_vars (struct recode_trns *); -static bool parse_mappings (struct recode_trns *); -static bool parse_dst_vars (struct recode_trns *); +static bool parse_src_vars (struct lexer *, struct recode_trns *, const struct dictionary *dict); +static bool parse_mappings (struct lexer *, struct recode_trns *); +static bool parse_dst_vars (struct lexer *, struct recode_trns *, const struct dictionary *dict); static void add_mapping (struct recode_trns *, size_t *map_allocated, const struct map_in *); -static bool parse_map_in (struct map_in *, struct pool *, +static bool parse_map_in (struct lexer *lexer, struct map_in *, struct pool *, enum var_type src_type, size_t max_src_width); static void set_map_in_generic (struct map_in *, enum map_in_type); static void set_map_in_num (struct map_in *, enum map_in_type, double, double); static void set_map_in_str (struct map_in *, struct pool *, const struct string *, size_t width); -static bool parse_map_out (struct pool *, struct map_out *); +static bool parse_map_out (struct lexer *lexer, struct pool *, struct map_out *); static void set_map_out_num (struct map_out *, double); static void set_map_out_str (struct map_out *, struct pool *, const struct string *); static void enlarge_dst_widths (struct recode_trns *); -static void create_dst_vars (struct recode_trns *); +static void create_dst_vars (struct recode_trns *, struct dictionary *); static trns_proc_func recode_trns_proc; static trns_free_func recode_trns_free; @@ -128,7 +137,7 @@ static trns_free_func recode_trns_free; /* Parses the RECODE transformation. */ int -cmd_recode (void) +cmd_recode (struct lexer *lexer, struct dataset *ds) { do { @@ -138,9 +147,9 @@ cmd_recode (void) /* Parse source variable names, then input to output mappings, then destintation variable names. */ - if (!parse_src_vars (trns) - || !parse_mappings (trns) - || !parse_dst_vars (trns)) + if (!parse_src_vars (lexer, trns, dataset_dict (ds) ) + || !parse_mappings (lexer, trns) + || !parse_dst_vars (lexer, trns, dataset_dict (ds))) { recode_trns_free (trns); return CMD_FAILURE; @@ -155,23 +164,25 @@ cmd_recode (void) This must be the final step; otherwise we'd have to delete destination variables on failure. */ if (trns->src_vars != trns->dst_vars) - create_dst_vars (trns); + create_dst_vars (trns, dataset_dict (ds)); /* Done. */ - add_transformation (recode_trns_proc, recode_trns_free, trns); + add_transformation (ds, + recode_trns_proc, recode_trns_free, trns); } - while (lex_match ('/')); + while (lex_match (lexer, '/')); - return lex_end_of_command (); + return lex_end_of_command (lexer); } /* Parses a set of variables to recode into TRNS->src_vars and TRNS->var_cnt. Sets TRNS->src_type. Returns true if successful, false on parse error. */ static bool -parse_src_vars (struct recode_trns *trns) +parse_src_vars (struct lexer *lexer, + struct recode_trns *trns, const struct dictionary *dict) { - if (!parse_variables (default_dict, &trns->src_vars, &trns->var_cnt, + if (!parse_variables (lexer, dict, &trns->src_vars, &trns->var_cnt, PV_SAME_TYPE)) return false; pool_register (trns->pool, free, trns->src_vars); @@ -183,7 +194,7 @@ parse_src_vars (struct recode_trns *trns) into TRNS->mappings and TRNS->map_cnt. Sets TRNS->dst_type. Returns true if successful, false on parse error. */ static bool -parse_mappings (struct recode_trns *trns) +parse_mappings (struct lexer *lexer, struct recode_trns *trns) { size_t max_src_width; size_t map_allocated; @@ -204,13 +215,13 @@ parse_mappings (struct recode_trns *trns) trns->map_cnt = 0; map_allocated = 0; have_dst_type = false; - if (!lex_force_match ('(')) + if (!lex_force_match (lexer, '(')) return false; do { enum var_type dst_type; - if (!lex_match_id ("CONVERT")) + if (!lex_match_id (lexer, "CONVERT")) { struct map_out out; size_t first_map_idx; @@ -222,15 +233,15 @@ parse_mappings (struct recode_trns *trns) do { struct map_in in; - if (!parse_map_in (&in, trns->pool, + if (!parse_map_in (lexer, &in, trns->pool, trns->src_type, max_src_width)) return false; add_mapping (trns, &map_allocated, &in); - lex_match (','); + lex_match (lexer, ','); } - while (!lex_match ('=')); + while (!lex_match (lexer, '=')); - if (!parse_map_out (trns->pool, &out)) + if (!parse_map_out (lexer, trns->pool, &out)) return false; dst_type = out.width == 0 ? NUMERIC : ALPHA; if (have_dst_type && dst_type != trns->dst_type) @@ -263,10 +274,10 @@ parse_mappings (struct recode_trns *trns) trns->dst_type = dst_type; have_dst_type = true; - if (!lex_force_match (')')) + if (!lex_force_match (lexer, ')')) return false; } - while (lex_match ('(')); + while (lex_match (lexer, '(')); return true; } @@ -277,31 +288,31 @@ parse_mappings (struct recode_trns *trns) be provided in MAX_SRC_WIDTH. Returns true if successful, false on parse error. */ static bool -parse_map_in (struct map_in *in, struct pool *pool, +parse_map_in (struct lexer *lexer, struct map_in *in, struct pool *pool, enum var_type src_type, size_t max_src_width) { - if (lex_match_id ("ELSE")) + if (lex_match_id (lexer, "ELSE")) set_map_in_generic (in, MAP_ELSE); else if (src_type == NUMERIC) { - if (lex_match_id ("MISSING")) + if (lex_match_id (lexer, "MISSING")) set_map_in_generic (in, MAP_MISSING); - else if (lex_match_id ("SYSMIS")) + else if (lex_match_id (lexer, "SYSMIS")) set_map_in_generic (in, MAP_SYSMIS); else { double x, y; - if (!parse_num_range (&x, &y, NULL)) + if (!parse_num_range (lexer, &x, &y, NULL)) return false; set_map_in_num (in, x == y ? MAP_SINGLE : MAP_RANGE, x, y); } } else { - if (!lex_force_string ()) + if (!lex_force_string (lexer)) return false; - set_map_in_str (in, pool, &tokstr, max_src_width); - lex_get (); + set_map_in_str (in, pool, lex_tokstr (lexer), max_src_width); + lex_get (lexer); } return true; @@ -355,25 +366,25 @@ set_map_in_str (struct map_in *in, struct pool *pool, /* Parses a mapping output value into OUT, allocating memory from POOL. Returns true if successful, false on parse error. */ static bool -parse_map_out (struct pool *pool, struct map_out *out) +parse_map_out (struct lexer *lexer, struct pool *pool, struct map_out *out) { - if (lex_is_number ()) + if (lex_is_number (lexer)) { - set_map_out_num (out, lex_number ()); - lex_get (); + set_map_out_num (out, lex_number (lexer)); + lex_get (lexer); } - else if (lex_match_id ("SYSMIS")) + else if (lex_match_id (lexer, "SYSMIS")) set_map_out_num (out, SYSMIS); - else if (token == T_STRING) + else if (lex_token (lexer) == T_STRING) { - set_map_out_str (out, pool, &tokstr); - lex_get (); + set_map_out_str (out, pool, lex_tokstr (lexer)); + lex_get (lexer); } - else if (lex_match_id ("COPY")) + else if (lex_match_id (lexer, "COPY")) out->copy_input = true; else { - lex_error (_("expecting output value")); + lex_error (lexer, _("expecting output value")); return false; } return true; @@ -405,16 +416,18 @@ set_map_out_str (struct map_out *out, struct pool *pool, /* Parses a set of target variables into TRNS->dst_vars and TRNS->dst_names. */ static bool -parse_dst_vars (struct recode_trns *trns) +parse_dst_vars (struct lexer *lexer, struct recode_trns *trns, + const struct dictionary *dict) { size_t i; - if (lex_match_id ("INTO")) + if (lex_match_id (lexer, "INTO")) { size_t name_cnt; size_t i; - if (!parse_mixed_vars_pool (trns->pool, &trns->dst_names, &name_cnt, + if (!parse_mixed_vars_pool (lexer, dict, trns->pool, + &trns->dst_names, &name_cnt, PV_NONE)) return false; @@ -432,8 +445,7 @@ parse_dst_vars (struct recode_trns *trns) for (i = 0; i < trns->var_cnt; i++) { struct variable *v; - v = trns->dst_vars[i] = dict_lookup_var (default_dict, - trns->dst_names[i]); + v = trns->dst_vars[i] = dict_lookup_var (dict, trns->dst_names[i]); if (v == NULL && trns->dst_type == ALPHA) { msg (SE, _("There is no variable named " @@ -506,7 +518,7 @@ enlarge_dst_widths (struct recode_trns *trns) /* Creates destination variables that don't already exist. */ static void -create_dst_vars (struct recode_trns *trns) +create_dst_vars (struct recode_trns *trns, struct dictionary *dict) { size_t i; @@ -515,9 +527,9 @@ create_dst_vars (struct recode_trns *trns) struct variable **var = &trns->dst_vars[i]; const char *name = trns->dst_names[i]; - *var = dict_lookup_var (default_dict, name); + *var = dict_lookup_var (dict, name); if (*var == NULL) - *var = dict_create_var_assert (default_dict, name, 0); + *var = dict_create_var_assert (dict, name, 0); assert ((*var)->type == trns->dst_type); } } @@ -552,7 +564,7 @@ find_src_numeric (struct recode_trns *trns, double value, struct variable *v) match = true; break; default: - abort (); + NOT_REACHED (); } if (match) @@ -585,21 +597,16 @@ find_src_string (struct recode_trns *trns, const char *value, int width) break; case MAP_CONVERT: { - struct data_in di; - - di.s = value; - di.e = value + width; - di.v = &out->value; - di.flags = DI_IGNORE_ERROR; - di.f1 = di.f2 = 0; - di.format.type = FMT_F; - di.format.w = width; - di.format.d = 0; - match = data_in (&di); + union value uv; + + msg_disable (); + match = data_in (ss_buffer (value, width), FMT_F, 0, 0, &uv, 0); + msg_enable (); + out->value.f = uv.f; break; } default: - abort (); + NOT_REACHED (); } if (match) @@ -611,7 +618,7 @@ find_src_string (struct recode_trns *trns, const char *value, int width) /* Performs RECODE transformation. */ static int -recode_trns_proc (void *trns_, struct ccase *c, int case_idx UNUSED) +recode_trns_proc (void *trns_, struct ccase *c, casenumber case_idx UNUSED) { struct recode_trns *trns = trns_; size_t i;