diff options
| author | Paul Sokolovsky <pfalcon@users.sourceforge.net> | 2015-01-23 02:15:56 +0200 |
|---|---|---|
| committer | Paul Sokolovsky <pfalcon@users.sourceforge.net> | 2015-01-23 02:15:56 +0200 |
| commit | 344e15b1ae641528b0f37447604ba66be9184a10 (patch) | |
| tree | 4eda273a0714f9c63cc99a86c19fd242048b058b /py/objstr.c | |
| parent | 6113eb2f3342223d3e5ca36d6ff12199e0d05164 (diff) | |
objstr: Remove code duplication and unbreak Windows build.
There was really weird warning (promoted to error) when building Windows
port. Exact cause is still unknown, but it uncovered another issue:
8-bit and unicode str_make_new implementations should be mutually exclusive,
and not built at the same time. What we had is that bytes_decode() pulled
8-bit str_make_new() even for unicode build.
Diffstat (limited to 'py/objstr.c')
| -rw-r--r-- | py/objstr.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/py/objstr.c b/py/objstr.c index de46ca688..f5a577552 100644 --- a/py/objstr.c +++ b/py/objstr.c @@ -130,8 +130,8 @@ STATIC void str_print(void (*print)(void *env, const char *fmt, ...), void *env, } } -#if !MICROPY_PY_BUILTINS_STR_UNICODE || MICROPY_CPYTHON_COMPAT -STATIC mp_obj_t str_make_new(mp_obj_t type_in, mp_uint_t n_args, mp_uint_t n_kw, const mp_obj_t *args) { +#if !MICROPY_PY_BUILTINS_STR_UNICODE +mp_obj_t mp_obj_str_make_new(mp_obj_t type_in, mp_uint_t n_args, mp_uint_t n_kw, const mp_obj_t *args) { #if MICROPY_CPYTHON_COMPAT if (n_kw != 0) { mp_arg_error_unimpl_kw(); @@ -1725,7 +1725,7 @@ STATIC mp_obj_t bytes_decode(mp_uint_t n_args, const mp_obj_t *args) { args = new_args; n_args++; } - return str_make_new((mp_obj_t)&mp_type_str, n_args, 0, args); + return mp_obj_str_make_new((mp_obj_t)&mp_type_str, n_args, 0, args); } // TODO: should accept kwargs too @@ -1831,7 +1831,7 @@ const mp_obj_type_t mp_type_str = { { &mp_type_type }, .name = MP_QSTR_str, .print = str_print, - .make_new = str_make_new, + .make_new = mp_obj_str_make_new, .binary_op = mp_obj_str_binary_op, .subscr = bytes_subscr, .getiter = mp_obj_new_str_iterator, |