X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flanguage%2Fxforms%2Frecode.c;h=62cf387eee9faf30b6afa4cff210c17124e76a26;hb=bc19562deb692e6db3271eb0402e9f9c99e4cbcb;hp=62b03ba073b9a5f6f6a1c5b282d9c26b0ce286b9;hpb=3bbb4370239deb29ebbf813d258aef6249e2a431;p=pspp-builds.git diff --git a/src/language/xforms/recode.c b/src/language/xforms/recode.c index 62b03ba0..62cf387e 100644 --- a/src/language/xforms/recode.c +++ b/src/language/xforms/recode.c @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 1997-9, 2000, 2009 Free Software Foundation, Inc. + Copyright (C) 1997-9, 2000, 2009, 2010, 2011 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 @@ -20,24 +20,26 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "xalloc.h" +#include "data/case.h" +#include "data/data-in.h" +#include "data/dictionary.h" +#include "data/format.h" +#include "data/procedure.h" +#include "data/transformations.h" +#include "data/variable.h" +#include "language/command.h" +#include "language/lexer/lexer.h" +#include "language/lexer/value-parser.h" +#include "language/lexer/variable-parser.h" +#include "libpspp/assertion.h" +#include "libpspp/cast.h" +#include "libpspp/compiler.h" +#include "libpspp/i18n.h" +#include "libpspp/message.h" +#include "libpspp/pool.h" +#include "libpspp/str.h" + +#include "gl/xalloc.h" #include "gettext.h" #define _(msgid) gettext (msgid) @@ -115,12 +117,12 @@ static bool parse_map_in (struct lexer *lexer, struct map_in *, struct pool *, 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); + struct substring, size_t width); 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 *); + struct substring); static void enlarge_dst_widths (struct recode_trns *); static void create_dst_vars (struct recode_trns *, struct dictionary *); @@ -158,6 +160,7 @@ cmd_recode (struct lexer *lexer, struct dataset *ds) /* Create destination variables, if needed. This must be the final step; otherwise we'd have to delete destination variables on failure. */ + trns->dst_dict = dataset_dict (ds); if (trns->src_vars != trns->dst_vars) create_dst_vars (trns, dataset_dict (ds)); @@ -165,7 +168,7 @@ cmd_recode (struct lexer *lexer, struct dataset *ds) add_transformation (ds, recode_trns_proc, recode_trns_free, trns); } - while (lex_match (lexer, '/')); + while (lex_match (lexer, T_SLASH)); return lex_end_of_command (lexer); } @@ -209,7 +212,7 @@ parse_mappings (struct lexer *lexer, struct recode_trns *trns) trns->map_cnt = 0; map_allocated = 0; have_dst_type = false; - if (!lex_force_match (lexer, '(')) + if (!lex_force_match (lexer, T_LPAREN)) return false; do { @@ -232,9 +235,9 @@ parse_mappings (struct lexer *lexer, struct recode_trns *trns) trns->src_type, trns->max_src_width)) return false; add_mapping (trns, &map_allocated, &in); - lex_match (lexer, ','); + lex_match (lexer, T_COMMA); } - while (!lex_match (lexer, '=')); + while (!lex_match (lexer, T_EQUALS)); if (!parse_map_out (lexer, trns->pool, &out)) return false; @@ -274,10 +277,10 @@ parse_mappings (struct lexer *lexer, struct recode_trns *trns) trns->dst_type = dst_type; have_dst_type = true; - if (!lex_force_match (lexer, ')')) + if (!lex_force_match (lexer, T_RPAREN)) return false; } - while (lex_match (lexer, '(')); + while (lex_match (lexer, T_LPAREN)); return true; } @@ -316,10 +319,10 @@ parse_map_in (struct lexer *lexer, struct map_in *in, struct pool *pool, return false; else { - set_map_in_str (in, pool, lex_tokstr (lexer), max_src_width); + set_map_in_str (in, pool, lex_tokss (lexer), max_src_width); lex_get (lexer); if (lex_token (lexer) == T_ID - && lex_id_match (ss_cstr ("THRU"), ss_cstr (lex_tokid (lexer)))) + && lex_id_match (ss_cstr ("THRU"), lex_tokss (lexer))) { msg (SE, _("THRU is not allowed with string variables.")); return false; @@ -368,12 +371,13 @@ set_map_in_num (struct map_in *in, enum map_in_type type, double x, double y) right to WIDTH characters long. */ static void set_map_in_str (struct map_in *in, struct pool *pool, - const struct string *string, size_t width) + struct substring string, size_t width) { in->type = MAP_SINGLE; value_init_pool (pool, &in->x, width); value_copy_buf_rpad (&in->x, width, - ds_data (string), ds_length (string), ' '); + CHAR_CAST_BUG (uint8_t *, ss_data (string)), + ss_length (string), ' '); } /* Parses a mapping output value into OUT, allocating memory from @@ -388,9 +392,9 @@ parse_map_out (struct lexer *lexer, struct pool *pool, struct map_out *out) } else if (lex_match_id (lexer, "SYSMIS")) set_map_out_num (out, SYSMIS); - else if (lex_token (lexer) == T_STRING) + else if (lex_is_string (lexer)) { - set_map_out_str (out, pool, lex_tokstr (lexer)); + set_map_out_str (out, pool, lex_tokss (lexer)); lex_get (lexer); } else if (lex_match_id (lexer, "COPY")) @@ -418,10 +422,10 @@ set_map_out_num (struct map_out *out, double value) /* Sets OUT as a string mapping output with the given VALUE. */ static void set_map_out_str (struct map_out *out, struct pool *pool, - const struct string *value) + const struct substring value) { - const char *string = ds_data (value); - size_t length = ds_length (value); + const char *string = ss_data (value); + size_t length = ss_length (value); if (length == 0) { @@ -543,8 +547,6 @@ create_dst_vars (struct recode_trns *trns, struct dictionary *dict) { size_t i; - trns->dst_dict = dict; - for (i = 0; i < trns->var_cnt; i++) { const struct variable **var = &trns->dst_vars[i]; @@ -606,8 +608,9 @@ static const struct map_out * find_src_string (struct recode_trns *trns, const uint8_t *value, const struct variable *src_var) { - struct mapping *m; + const char *encoding = dict_get_encoding (trns->dst_dict); int width = var_get_width (src_var); + struct mapping *m; for (m = trns->mappings; m < trns->mappings + trns->map_cnt; m++) { @@ -627,11 +630,13 @@ find_src_string (struct recode_trns *trns, const uint8_t *value, case MAP_CONVERT: { union value uv; + char *error; + + error = data_in (ss_buffer (CHAR_CAST_BUG (char *, value), width), + C_ENCODING, FMT_F, &uv, 0, encoding); + match = error == NULL; + free (error); - msg_disable (); - match = data_in (ss_buffer (value, width), LEGACY_NATIVE, - FMT_F, 0, 0, 0, trns->dst_dict, &uv, 0); - msg_enable (); out->value.f = uv.f; break; } @@ -678,7 +683,7 @@ recode_trns_proc (void *trns_, struct ccase **c, casenumber case_idx UNUSED) } else { - char *dst = case_str_rw (*c, dst_var); + char *dst = CHAR_CAST_BUG (char *, case_str_rw (*c, dst_var)); if (out != NULL) { if (!out->copy_input)