projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
i18n: Introduce C_ENCODING as replacement for LEGACY_NATIVE.
[pspp-builds.git]
/
src
/
language
/
xforms
/
recode.c
diff --git
a/src/language/xforms/recode.c
b/src/language/xforms/recode.c
index c9787b11bdfeaf3094b1650a76daa50dabedb76e..62cf387eee9faf30b6afa4cff210c17124e76a26 100644
(file)
--- a/
src/language/xforms/recode.c
+++ b/
src/language/xforms/recode.c
@@
-1,5
+1,5
@@
/* PSPP - a program for statistical analysis.
/* PSPP - a program for statistical analysis.
- Copyright (C) 1997-9, 2000, 2009, 2010 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
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
@@
-34,6
+34,7
@@
#include "libpspp/assertion.h"
#include "libpspp/cast.h"
#include "libpspp/compiler.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 "libpspp/message.h"
#include "libpspp/pool.h"
#include "libpspp/str.h"
@@
-116,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 *,
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 *,
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 *);
static void enlarge_dst_widths (struct recode_trns *);
static void create_dst_vars (struct recode_trns *, struct dictionary *);
@@
-167,7
+168,7
@@
cmd_recode (struct lexer *lexer, struct dataset *ds)
add_transformation (ds,
recode_trns_proc, recode_trns_free, trns);
}
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);
}
return lex_end_of_command (lexer);
}
@@
-211,7
+212,7
@@
parse_mappings (struct lexer *lexer, struct recode_trns *trns)
trns->map_cnt = 0;
map_allocated = 0;
have_dst_type = false;
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
{
return false;
do
{
@@
-234,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);
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;
if (!parse_map_out (lexer, trns->pool, &out))
return false;
@@
-276,10
+277,10
@@
parse_mappings (struct lexer *lexer, struct recode_trns *trns)
trns->dst_type = dst_type;
have_dst_type = true;
trns->dst_type = dst_type;
have_dst_type = true;
- if (!lex_force_match (lexer,
')'
))
+ if (!lex_force_match (lexer,
T_RPAREN
))
return false;
}
return false;
}
- while (lex_match (lexer,
'('
));
+ while (lex_match (lexer,
T_LPAREN
));
return true;
}
return true;
}
@@
-318,10
+319,10
@@
parse_map_in (struct lexer *lexer, struct map_in *in, struct pool *pool,
return false;
else
{
return false;
else
{
- set_map_in_str (in, pool, lex_toks
tr
(lexer), max_src_width);
+ set_map_in_str (in, pool, lex_toks
s
(lexer), max_src_width);
lex_get (lexer);
if (lex_token (lexer) == T_ID
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;
{
msg (SE, _("THRU is not allowed with string variables."));
return false;
@@
-370,13
+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,
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,
{
in->type = MAP_SINGLE;
value_init_pool (pool, &in->x, width);
value_copy_buf_rpad (&in->x, width,
- CHAR_CAST_BUG (uint8_t *,
d
s_data (string)),
-
d
s_length (string), ' ');
+ CHAR_CAST_BUG (uint8_t *,
s
s_data (string)),
+
s
s_length (string), ' ');
}
/* Parses a mapping output value into OUT, allocating memory from
}
/* Parses a mapping output value into OUT, allocating memory from
@@
-393,7
+394,7
@@
parse_map_out (struct lexer *lexer, struct pool *pool, struct map_out *out)
set_map_out_num (out, SYSMIS);
else if (lex_is_string (lexer))
{
set_map_out_num (out, SYSMIS);
else if (lex_is_string (lexer))
{
- set_map_out_str (out, pool, lex_toks
tr
(lexer));
+ set_map_out_str (out, pool, lex_toks
s
(lexer));
lex_get (lexer);
}
else if (lex_match_id (lexer, "COPY"))
lex_get (lexer);
}
else if (lex_match_id (lexer, "COPY"))
@@
-421,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,
/* 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 s
tring *
value)
+ const struct s
ubstring
value)
{
{
- const char *string =
d
s_data (value);
- size_t length =
d
s_length (value);
+ const char *string =
s
s_data (value);
+ size_t length =
s
s_length (value);
if (length == 0)
{
if (length == 0)
{
@@
-629,11
+630,13
@@
find_src_string (struct recode_trns *trns, const uint8_t *value,
case MAP_CONVERT:
{
union value uv;
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 (CHAR_CAST_BUG (char *, value), width),
- LEGACY_NATIVE, FMT_F, 0, 0, &uv, 0, encoding);
- msg_enable ();
out->value.f = uv.f;
break;
}
out->value.f = uv.f;
break;
}