2014-03-16 03:14:26 -04:00
|
|
|
#include <stdbool.h>
|
2013-12-21 13:17:45 -05:00
|
|
|
#include <string.h>
|
|
|
|
#include <assert.h>
|
|
|
|
|
|
|
|
#include "nlr.h"
|
|
|
|
#include "misc.h"
|
|
|
|
#include "mpconfig.h"
|
2014-01-21 16:40:13 -05:00
|
|
|
#include "qstr.h"
|
2013-12-21 13:17:45 -05:00
|
|
|
#include "obj.h"
|
|
|
|
#include "runtime0.h"
|
|
|
|
#include "runtime.h"
|
2014-03-31 00:06:50 -04:00
|
|
|
#include "pfenv.h"
|
2013-12-21 13:17:45 -05:00
|
|
|
|
|
|
|
typedef struct _mp_obj_str_t {
|
|
|
|
mp_obj_base_t base;
|
2014-01-22 09:35:10 -05:00
|
|
|
machine_uint_t hash : 16; // XXX here we assume the hash size is 16 bits (it is at the moment; see qstr.c)
|
|
|
|
machine_uint_t len : 16; // len == number of bytes used in data, alloc = len + 1 because (at the moment) we also append a null byte
|
2014-03-20 10:47:44 -04:00
|
|
|
const byte *data;
|
2013-12-21 13:17:45 -05:00
|
|
|
} mp_obj_str_t;
|
|
|
|
|
2014-03-31 14:18:28 -04:00
|
|
|
STATIC mp_obj_t str_modulo_format(mp_obj_t pattern, uint n_args, const mp_obj_t *args);
|
2014-03-21 17:46:59 -04:00
|
|
|
const mp_obj_t mp_const_empty_bytes;
|
|
|
|
|
2014-01-22 09:35:10 -05:00
|
|
|
// use this macro to extract the string hash
|
|
|
|
#define GET_STR_HASH(str_obj_in, str_hash) uint str_hash; if (MP_OBJ_IS_QSTR(str_obj_in)) { str_hash = qstr_hash(MP_OBJ_QSTR_VALUE(str_obj_in)); } else { str_hash = ((mp_obj_str_t*)str_obj_in)->hash; }
|
|
|
|
|
|
|
|
// use this macro to extract the string length
|
|
|
|
#define GET_STR_LEN(str_obj_in, str_len) uint str_len; if (MP_OBJ_IS_QSTR(str_obj_in)) { str_len = qstr_len(MP_OBJ_QSTR_VALUE(str_obj_in)); } else { str_len = ((mp_obj_str_t*)str_obj_in)->len; }
|
|
|
|
|
|
|
|
// use this macro to extract the string data and length
|
|
|
|
#define GET_STR_DATA_LEN(str_obj_in, str_data, str_len) const byte *str_data; uint str_len; if (MP_OBJ_IS_QSTR(str_obj_in)) { str_data = qstr_data(MP_OBJ_QSTR_VALUE(str_obj_in), &str_len); } else { str_len = ((mp_obj_str_t*)str_obj_in)->len; str_data = ((mp_obj_str_t*)str_obj_in)->data; }
|
|
|
|
|
2014-02-12 11:15:40 -05:00
|
|
|
STATIC mp_obj_t mp_obj_new_str_iterator(mp_obj_t str);
|
|
|
|
STATIC mp_obj_t mp_obj_new_bytes_iterator(mp_obj_t str);
|
2014-03-21 05:39:01 -04:00
|
|
|
STATIC mp_obj_t str_new(const mp_obj_type_t *type, const byte* data, uint len);
|
2014-01-05 05:47:51 -05:00
|
|
|
|
|
|
|
/******************************************************************************/
|
|
|
|
/* str */
|
|
|
|
|
2014-01-27 20:40:06 -05:00
|
|
|
void mp_str_print_quoted(void (*print)(void *env, const char *fmt, ...), void *env, const byte *str_data, uint str_len) {
|
|
|
|
// this escapes characters, but it will be very slow to print (calling print many times)
|
|
|
|
bool has_single_quote = false;
|
|
|
|
bool has_double_quote = false;
|
|
|
|
for (const byte *s = str_data, *top = str_data + str_len; (!has_single_quote || !has_double_quote) && s < top; s++) {
|
|
|
|
if (*s == '\'') {
|
|
|
|
has_single_quote = true;
|
|
|
|
} else if (*s == '"') {
|
|
|
|
has_double_quote = true;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
int quote_char = '\'';
|
|
|
|
if (has_single_quote && !has_double_quote) {
|
|
|
|
quote_char = '"';
|
|
|
|
}
|
|
|
|
print(env, "%c", quote_char);
|
|
|
|
for (const byte *s = str_data, *top = str_data + str_len; s < top; s++) {
|
|
|
|
if (*s == quote_char) {
|
|
|
|
print(env, "\\%c", quote_char);
|
|
|
|
} else if (*s == '\\') {
|
|
|
|
print(env, "\\\\");
|
|
|
|
} else if (32 <= *s && *s <= 126) {
|
|
|
|
print(env, "%c", *s);
|
|
|
|
} else if (*s == '\n') {
|
|
|
|
print(env, "\\n");
|
|
|
|
// TODO add more escape codes here if we want to match CPython
|
|
|
|
} else {
|
|
|
|
print(env, "\\x%02x", *s);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
print(env, "%c", quote_char);
|
|
|
|
}
|
|
|
|
|
2014-02-12 11:15:40 -05:00
|
|
|
STATIC void str_print(void (*print)(void *env, const char *fmt, ...), void *env, mp_obj_t self_in, mp_print_kind_t kind) {
|
2014-01-22 09:35:10 -05:00
|
|
|
GET_STR_DATA_LEN(self_in, str_data, str_len);
|
2014-03-29 09:43:38 -04:00
|
|
|
bool is_bytes = MP_OBJ_IS_TYPE(self_in, &mp_type_bytes);
|
2014-01-24 15:50:40 -05:00
|
|
|
if (kind == PRINT_STR && !is_bytes) {
|
2014-01-22 09:35:10 -05:00
|
|
|
print(env, "%.*s", str_len, str_data);
|
2014-01-13 12:19:16 -05:00
|
|
|
} else {
|
2014-01-24 15:50:40 -05:00
|
|
|
if (is_bytes) {
|
|
|
|
print(env, "b");
|
|
|
|
}
|
2014-01-27 20:40:06 -05:00
|
|
|
mp_str_print_quoted(print, env, str_data, str_len);
|
2014-01-13 12:19:16 -05:00
|
|
|
}
|
2013-12-21 13:17:45 -05:00
|
|
|
}
|
|
|
|
|
2014-03-21 05:39:01 -04:00
|
|
|
STATIC mp_obj_t str_make_new(mp_obj_t type_in, uint n_args, uint n_kw, const mp_obj_t *args) {
|
|
|
|
switch (n_args) {
|
|
|
|
case 0:
|
|
|
|
return MP_OBJ_NEW_QSTR(MP_QSTR_);
|
|
|
|
|
|
|
|
case 1:
|
|
|
|
{
|
|
|
|
vstr_t *vstr = vstr_new();
|
|
|
|
mp_obj_print_helper((void (*)(void*, const char*, ...))vstr_printf, vstr, args[0], PRINT_STR);
|
|
|
|
mp_obj_t s = mp_obj_new_str((byte*)vstr->buf, vstr->len, false);
|
|
|
|
vstr_free(vstr);
|
|
|
|
return s;
|
|
|
|
}
|
|
|
|
|
|
|
|
case 2:
|
|
|
|
case 3:
|
|
|
|
{
|
|
|
|
// TODO: validate 2nd/3rd args
|
2014-03-29 09:43:38 -04:00
|
|
|
if (!MP_OBJ_IS_TYPE(args[0], &mp_type_bytes)) {
|
2014-04-05 13:32:08 -04:00
|
|
|
nlr_raise(mp_obj_new_exception_msg(&mp_type_TypeError, "bytes expected"));
|
2014-03-21 05:39:01 -04:00
|
|
|
}
|
|
|
|
GET_STR_DATA_LEN(args[0], str_data, str_len);
|
|
|
|
GET_STR_HASH(args[0], str_hash);
|
2014-03-29 09:43:38 -04:00
|
|
|
mp_obj_str_t *o = str_new(&mp_type_str, NULL, str_len);
|
2014-03-21 05:39:01 -04:00
|
|
|
o->data = str_data;
|
|
|
|
o->hash = str_hash;
|
|
|
|
return o;
|
|
|
|
}
|
|
|
|
|
|
|
|
default:
|
2014-04-05 13:32:08 -04:00
|
|
|
nlr_raise(mp_obj_new_exception_msg(&mp_type_TypeError, "str takes at most 3 arguments"));
|
2014-03-21 05:39:01 -04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-03-21 17:46:59 -04:00
|
|
|
STATIC mp_obj_t bytes_make_new(mp_obj_t type_in, uint n_args, uint n_kw, const mp_obj_t *args) {
|
|
|
|
if (n_args == 0) {
|
|
|
|
return mp_const_empty_bytes;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (MP_OBJ_IS_STR(args[0])) {
|
|
|
|
if (n_args < 2 || n_args > 3) {
|
|
|
|
goto wrong_args;
|
|
|
|
}
|
|
|
|
GET_STR_DATA_LEN(args[0], str_data, str_len);
|
|
|
|
GET_STR_HASH(args[0], str_hash);
|
2014-03-29 09:43:38 -04:00
|
|
|
mp_obj_str_t *o = str_new(&mp_type_bytes, NULL, str_len);
|
2014-03-21 17:46:59 -04:00
|
|
|
o->data = str_data;
|
|
|
|
o->hash = str_hash;
|
|
|
|
return o;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (n_args > 1) {
|
|
|
|
goto wrong_args;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (MP_OBJ_IS_SMALL_INT(args[0])) {
|
|
|
|
uint len = MP_OBJ_SMALL_INT_VALUE(args[0]);
|
|
|
|
byte *data;
|
|
|
|
|
2014-03-29 09:43:38 -04:00
|
|
|
mp_obj_t o = mp_obj_str_builder_start(&mp_type_bytes, len, &data);
|
2014-03-21 17:46:59 -04:00
|
|
|
memset(data, 0, len);
|
|
|
|
return mp_obj_str_builder_end(o);
|
|
|
|
}
|
|
|
|
|
|
|
|
int len;
|
|
|
|
byte *data;
|
|
|
|
vstr_t *vstr = NULL;
|
|
|
|
mp_obj_t o = NULL;
|
|
|
|
// Try to create array of exact len if initializer len is known
|
|
|
|
mp_obj_t len_in = mp_obj_len_maybe(args[0]);
|
|
|
|
if (len_in == MP_OBJ_NULL) {
|
|
|
|
len = -1;
|
|
|
|
vstr = vstr_new();
|
|
|
|
} else {
|
|
|
|
len = MP_OBJ_SMALL_INT_VALUE(len_in);
|
2014-03-29 09:43:38 -04:00
|
|
|
o = mp_obj_str_builder_start(&mp_type_bytes, len, &data);
|
2014-03-21 17:46:59 -04:00
|
|
|
}
|
|
|
|
|
2014-03-30 08:35:08 -04:00
|
|
|
mp_obj_t iterable = mp_getiter(args[0]);
|
2014-03-21 17:46:59 -04:00
|
|
|
mp_obj_t item;
|
2014-03-30 08:35:08 -04:00
|
|
|
while ((item = mp_iternext(iterable)) != MP_OBJ_NULL) {
|
2014-03-21 17:46:59 -04:00
|
|
|
if (len == -1) {
|
|
|
|
vstr_add_char(vstr, MP_OBJ_SMALL_INT_VALUE(item));
|
|
|
|
} else {
|
|
|
|
*data++ = MP_OBJ_SMALL_INT_VALUE(item);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (len == -1) {
|
|
|
|
vstr_shrink(vstr);
|
|
|
|
// TODO: Optimize, borrow buffer from vstr
|
|
|
|
len = vstr_len(vstr);
|
2014-03-29 09:43:38 -04:00
|
|
|
o = mp_obj_str_builder_start(&mp_type_bytes, len, &data);
|
2014-03-21 17:46:59 -04:00
|
|
|
memcpy(data, vstr_str(vstr), len);
|
|
|
|
vstr_free(vstr);
|
|
|
|
}
|
|
|
|
|
|
|
|
return mp_obj_str_builder_end(o);
|
|
|
|
|
|
|
|
wrong_args:
|
2014-04-05 13:32:08 -04:00
|
|
|
nlr_raise(mp_obj_new_exception_msg(&mp_type_TypeError, "wrong number of arguments"));
|
2014-03-21 17:46:59 -04:00
|
|
|
}
|
|
|
|
|
2014-01-21 16:40:13 -05:00
|
|
|
// like strstr but with specified length and allows \0 bytes
|
|
|
|
// TODO replace with something more efficient/standard
|
2014-03-24 02:31:58 -04:00
|
|
|
STATIC const byte *find_subbytes(const byte *haystack, machine_uint_t hlen, const byte *needle, machine_uint_t nlen, machine_int_t direction) {
|
2014-01-21 16:40:13 -05:00
|
|
|
if (hlen >= nlen) {
|
2014-03-24 02:31:58 -04:00
|
|
|
machine_uint_t str_index, str_index_end;
|
|
|
|
if (direction > 0) {
|
|
|
|
str_index = 0;
|
|
|
|
str_index_end = hlen - nlen;
|
|
|
|
} else {
|
|
|
|
str_index = hlen - nlen;
|
|
|
|
str_index_end = 0;
|
|
|
|
}
|
|
|
|
for (;;) {
|
|
|
|
if (memcmp(&haystack[str_index], needle, nlen) == 0) {
|
|
|
|
//found
|
|
|
|
return haystack + str_index;
|
2014-01-21 16:40:13 -05:00
|
|
|
}
|
2014-03-24 02:31:58 -04:00
|
|
|
if (str_index == str_index_end) {
|
|
|
|
//not found
|
|
|
|
break;
|
2014-01-21 16:40:13 -05:00
|
|
|
}
|
2014-03-24 02:31:58 -04:00
|
|
|
str_index += direction;
|
2014-01-21 16:40:13 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2014-02-12 11:15:40 -05:00
|
|
|
STATIC mp_obj_t str_binary_op(int op, mp_obj_t lhs_in, mp_obj_t rhs_in) {
|
2014-01-22 09:35:10 -05:00
|
|
|
GET_STR_DATA_LEN(lhs_in, lhs_data, lhs_len);
|
2013-12-21 13:17:45 -05:00
|
|
|
switch (op) {
|
2014-03-30 08:35:08 -04:00
|
|
|
case MP_BINARY_OP_SUBSCR:
|
2014-01-02 19:51:16 -05:00
|
|
|
// TODO: need predicate to check for int-like type (bools are such for example)
|
|
|
|
// ["no", "yes"][1 == 2] is common idiom
|
|
|
|
if (MP_OBJ_IS_SMALL_INT(rhs_in)) {
|
2014-03-13 01:57:16 -04:00
|
|
|
uint index = mp_get_index(mp_obj_get_type(lhs_in), lhs_len, rhs_in, false);
|
2014-03-29 09:43:38 -04:00
|
|
|
if (MP_OBJ_IS_TYPE(lhs_in, &mp_type_bytes)) {
|
2014-01-24 19:17:36 -05:00
|
|
|
return MP_OBJ_NEW_SMALL_INT((mp_small_int_t)lhs_data[index]);
|
2014-01-24 15:50:40 -05:00
|
|
|
} else {
|
|
|
|
return mp_obj_new_str(lhs_data + index, 1, true);
|
|
|
|
}
|
2014-01-03 18:34:23 -05:00
|
|
|
#if MICROPY_ENABLE_SLICE
|
2014-03-29 09:43:38 -04:00
|
|
|
} else if (MP_OBJ_IS_TYPE(rhs_in, &mp_type_slice)) {
|
2014-02-01 19:38:22 -05:00
|
|
|
machine_uint_t start, stop;
|
2014-02-02 01:57:05 -05:00
|
|
|
if (!m_seq_get_fast_slice_indexes(lhs_len, rhs_in, &start, &stop)) {
|
|
|
|
assert(0);
|
|
|
|
}
|
2014-01-22 09:35:10 -05:00
|
|
|
return mp_obj_new_str(lhs_data + start, stop - start, false);
|
2014-01-03 18:34:23 -05:00
|
|
|
#endif
|
2014-01-02 19:51:16 -05:00
|
|
|
} else {
|
2014-01-03 18:38:26 -05:00
|
|
|
// Message doesn't match CPython, but we don't have so much bytes as they
|
|
|
|
// to spend them on verbose wording
|
2014-04-05 13:32:08 -04:00
|
|
|
nlr_raise(mp_obj_new_exception_msg(&mp_type_TypeError, "index must be int"));
|
2014-01-02 19:51:16 -05:00
|
|
|
}
|
2013-12-21 13:17:45 -05:00
|
|
|
|
2014-03-30 08:35:08 -04:00
|
|
|
case MP_BINARY_OP_ADD:
|
|
|
|
case MP_BINARY_OP_INPLACE_ADD:
|
2014-01-22 09:35:10 -05:00
|
|
|
if (MP_OBJ_IS_STR(rhs_in)) {
|
2013-12-21 13:17:45 -05:00
|
|
|
// add 2 strings
|
2014-01-22 09:35:10 -05:00
|
|
|
|
|
|
|
GET_STR_DATA_LEN(rhs_in, rhs_data, rhs_len);
|
2014-01-21 16:40:13 -05:00
|
|
|
int alloc_len = lhs_len + rhs_len;
|
2014-01-22 09:35:10 -05:00
|
|
|
|
|
|
|
/* code for making qstr
|
2014-01-21 16:40:13 -05:00
|
|
|
byte *q_ptr;
|
|
|
|
byte *val = qstr_build_start(alloc_len, &q_ptr);
|
|
|
|
memcpy(val, lhs_data, lhs_len);
|
|
|
|
memcpy(val + lhs_len, rhs_data, rhs_len);
|
2014-01-22 09:35:10 -05:00
|
|
|
return MP_OBJ_NEW_QSTR(qstr_build_end(q_ptr));
|
|
|
|
*/
|
|
|
|
|
|
|
|
// code for non-qstr
|
|
|
|
byte *data;
|
2014-01-24 15:50:40 -05:00
|
|
|
mp_obj_t s = mp_obj_str_builder_start(mp_obj_get_type(lhs_in), alloc_len, &data);
|
2014-01-22 09:35:10 -05:00
|
|
|
memcpy(data, lhs_data, lhs_len);
|
|
|
|
memcpy(data + lhs_len, rhs_data, rhs_len);
|
|
|
|
return mp_obj_str_builder_end(s);
|
2013-12-21 13:17:45 -05:00
|
|
|
}
|
|
|
|
break;
|
2014-01-22 09:35:10 -05:00
|
|
|
|
2014-03-30 08:35:08 -04:00
|
|
|
case MP_BINARY_OP_IN:
|
2014-01-11 07:39:33 -05:00
|
|
|
/* NOTE `a in b` is `b.__contains__(a)` */
|
2014-01-22 09:35:10 -05:00
|
|
|
if (MP_OBJ_IS_STR(rhs_in)) {
|
|
|
|
GET_STR_DATA_LEN(rhs_in, rhs_data, rhs_len);
|
2014-03-24 02:31:58 -04:00
|
|
|
return MP_BOOL(find_subbytes(lhs_data, lhs_len, rhs_data, rhs_len, 1) != NULL);
|
2014-01-11 07:39:33 -05:00
|
|
|
}
|
|
|
|
break;
|
2014-01-22 09:35:10 -05:00
|
|
|
|
2014-03-30 08:35:08 -04:00
|
|
|
case MP_BINARY_OP_MULTIPLY:
|
2014-01-20 17:27:33 -05:00
|
|
|
{
|
|
|
|
if (!MP_OBJ_IS_SMALL_INT(rhs_in)) {
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
int n = MP_OBJ_SMALL_INT_VALUE(rhs_in);
|
2014-01-22 09:35:10 -05:00
|
|
|
byte *data;
|
2014-01-24 15:50:40 -05:00
|
|
|
mp_obj_t s = mp_obj_str_builder_start(mp_obj_get_type(lhs_in), lhs_len * n, &data);
|
2014-01-22 09:35:10 -05:00
|
|
|
mp_seq_multiply(lhs_data, sizeof(*lhs_data), lhs_len, n, data);
|
|
|
|
return mp_obj_str_builder_end(s);
|
2014-01-20 17:27:33 -05:00
|
|
|
}
|
2014-02-02 01:24:07 -05:00
|
|
|
|
2014-03-31 14:18:28 -04:00
|
|
|
case MP_BINARY_OP_MODULO: {
|
|
|
|
mp_obj_t *args;
|
|
|
|
uint n_args;
|
|
|
|
if (MP_OBJ_IS_TYPE(rhs_in, &mp_type_tuple)) {
|
|
|
|
// TODO: Support tuple subclasses?
|
|
|
|
mp_obj_tuple_get(rhs_in, &n_args, &args);
|
|
|
|
} else {
|
|
|
|
args = &rhs_in;
|
|
|
|
n_args = 1;
|
|
|
|
}
|
|
|
|
return str_modulo_format(lhs_in, n_args, args);
|
|
|
|
}
|
|
|
|
|
2014-03-30 08:35:08 -04:00
|
|
|
// These 2 are never passed here, dealt with as a special case in mp_binary_op().
|
|
|
|
//case MP_BINARY_OP_EQUAL:
|
|
|
|
//case MP_BINARY_OP_NOT_EQUAL:
|
|
|
|
case MP_BINARY_OP_LESS:
|
|
|
|
case MP_BINARY_OP_LESS_EQUAL:
|
|
|
|
case MP_BINARY_OP_MORE:
|
|
|
|
case MP_BINARY_OP_MORE_EQUAL:
|
2014-02-02 01:24:07 -05:00
|
|
|
if (MP_OBJ_IS_STR(rhs_in)) {
|
|
|
|
GET_STR_DATA_LEN(rhs_in, rhs_data, rhs_len);
|
|
|
|
return MP_BOOL(mp_seq_cmp_bytes(op, lhs_data, lhs_len, rhs_data, rhs_len));
|
|
|
|
}
|
2013-12-21 13:17:45 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
return MP_OBJ_NULL; // op not supported
|
|
|
|
}
|
|
|
|
|
2014-02-12 11:15:40 -05:00
|
|
|
STATIC mp_obj_t str_join(mp_obj_t self_in, mp_obj_t arg) {
|
2014-01-22 09:35:10 -05:00
|
|
|
assert(MP_OBJ_IS_STR(self_in));
|
2013-12-21 13:17:45 -05:00
|
|
|
|
2014-01-02 11:36:09 -05:00
|
|
|
// get separation string
|
2014-01-22 09:35:10 -05:00
|
|
|
GET_STR_DATA_LEN(self_in, sep_str, sep_len);
|
2014-01-02 11:36:09 -05:00
|
|
|
|
|
|
|
// process args
|
2013-12-21 13:17:45 -05:00
|
|
|
uint seq_len;
|
|
|
|
mp_obj_t *seq_items;
|
2014-03-29 09:15:08 -04:00
|
|
|
if (MP_OBJ_IS_TYPE(arg, &mp_type_tuple)) {
|
2013-12-21 13:17:45 -05:00
|
|
|
mp_obj_tuple_get(arg, &seq_len, &seq_items);
|
2014-03-29 09:43:38 -04:00
|
|
|
} else if (MP_OBJ_IS_TYPE(arg, &mp_type_list)) {
|
2013-12-21 13:17:45 -05:00
|
|
|
mp_obj_list_get(arg, &seq_len, &seq_items);
|
|
|
|
} else {
|
|
|
|
goto bad_arg;
|
|
|
|
}
|
2014-01-02 11:36:09 -05:00
|
|
|
|
|
|
|
// count required length
|
|
|
|
int required_len = 0;
|
2013-12-21 13:17:45 -05:00
|
|
|
for (int i = 0; i < seq_len; i++) {
|
2014-01-22 09:35:10 -05:00
|
|
|
if (!MP_OBJ_IS_STR(seq_items[i])) {
|
2013-12-21 13:17:45 -05:00
|
|
|
goto bad_arg;
|
|
|
|
}
|
2014-01-02 11:36:09 -05:00
|
|
|
if (i > 0) {
|
|
|
|
required_len += sep_len;
|
|
|
|
}
|
2014-01-22 09:35:10 -05:00
|
|
|
GET_STR_LEN(seq_items[i], l);
|
|
|
|
required_len += l;
|
2013-12-21 13:17:45 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
// make joined string
|
2014-01-22 09:35:10 -05:00
|
|
|
byte *data;
|
2014-01-24 15:50:40 -05:00
|
|
|
mp_obj_t joined_str = mp_obj_str_builder_start(mp_obj_get_type(self_in), required_len, &data);
|
2013-12-21 13:17:45 -05:00
|
|
|
for (int i = 0; i < seq_len; i++) {
|
|
|
|
if (i > 0) {
|
2014-01-22 09:35:10 -05:00
|
|
|
memcpy(data, sep_str, sep_len);
|
|
|
|
data += sep_len;
|
2013-12-21 13:17:45 -05:00
|
|
|
}
|
2014-01-22 09:35:10 -05:00
|
|
|
GET_STR_DATA_LEN(seq_items[i], s, l);
|
|
|
|
memcpy(data, s, l);
|
|
|
|
data += l;
|
2013-12-21 13:17:45 -05:00
|
|
|
}
|
2014-01-02 11:36:09 -05:00
|
|
|
|
|
|
|
// return joined string
|
2014-01-22 09:35:10 -05:00
|
|
|
return mp_obj_str_builder_end(joined_str);
|
2013-12-21 13:17:45 -05:00
|
|
|
|
|
|
|
bad_arg:
|
2014-04-05 13:32:08 -04:00
|
|
|
nlr_raise(mp_obj_new_exception_msg(&mp_type_TypeError, "?str.join expecting a list of str's"));
|
2013-12-21 13:17:45 -05:00
|
|
|
}
|
|
|
|
|
2014-01-20 22:00:21 -05:00
|
|
|
#define is_ws(c) ((c) == ' ' || (c) == '\t')
|
|
|
|
|
2014-02-12 11:15:40 -05:00
|
|
|
STATIC mp_obj_t str_split(uint n_args, const mp_obj_t *args) {
|
2014-01-20 22:00:21 -05:00
|
|
|
int splits = -1;
|
|
|
|
mp_obj_t sep = mp_const_none;
|
|
|
|
if (n_args > 1) {
|
|
|
|
sep = args[1];
|
|
|
|
if (n_args > 2) {
|
|
|
|
splits = MP_OBJ_SMALL_INT_VALUE(args[2]);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
assert(sep == mp_const_none);
|
2014-01-21 16:54:15 -05:00
|
|
|
(void)sep; // unused; to hush compiler warning
|
2014-01-20 22:00:21 -05:00
|
|
|
mp_obj_t res = mp_obj_new_list(0, NULL);
|
2014-01-22 09:35:10 -05:00
|
|
|
GET_STR_DATA_LEN(args[0], s, len);
|
|
|
|
const byte *top = s + len;
|
|
|
|
const byte *start;
|
2014-01-20 22:00:21 -05:00
|
|
|
|
|
|
|
// Initial whitespace is not counted as split, so we pre-do it
|
2014-01-22 09:35:10 -05:00
|
|
|
while (s < top && is_ws(*s)) s++;
|
|
|
|
while (s < top && splits != 0) {
|
2014-01-20 22:00:21 -05:00
|
|
|
start = s;
|
2014-01-22 09:35:10 -05:00
|
|
|
while (s < top && !is_ws(*s)) s++;
|
2014-03-31 11:28:13 -04:00
|
|
|
mp_obj_list_append(res, mp_obj_new_str(start, s - start, false));
|
2014-01-22 09:35:10 -05:00
|
|
|
if (s >= top) {
|
2014-01-20 22:00:21 -05:00
|
|
|
break;
|
|
|
|
}
|
2014-01-22 09:35:10 -05:00
|
|
|
while (s < top && is_ws(*s)) s++;
|
2014-01-20 22:00:21 -05:00
|
|
|
if (splits > 0) {
|
|
|
|
splits--;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-01-22 09:35:10 -05:00
|
|
|
if (s < top) {
|
2014-03-31 11:28:13 -04:00
|
|
|
mp_obj_list_append(res, mp_obj_new_str(s, top - s, false));
|
2014-01-20 22:00:21 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
return res;
|
|
|
|
}
|
|
|
|
|
2014-03-24 02:31:58 -04:00
|
|
|
STATIC mp_obj_t str_finder(uint n_args, const mp_obj_t *args, machine_int_t direction) {
|
2014-01-12 16:53:52 -05:00
|
|
|
assert(2 <= n_args && n_args <= 4);
|
2014-01-22 09:35:10 -05:00
|
|
|
assert(MP_OBJ_IS_STR(args[0]));
|
|
|
|
assert(MP_OBJ_IS_STR(args[1]));
|
2014-01-12 16:53:52 -05:00
|
|
|
|
2014-01-22 09:35:10 -05:00
|
|
|
GET_STR_DATA_LEN(args[0], haystack, haystack_len);
|
|
|
|
GET_STR_DATA_LEN(args[1], needle, needle_len);
|
2014-01-12 16:53:52 -05:00
|
|
|
|
2014-03-16 20:58:35 -04:00
|
|
|
machine_uint_t start = 0;
|
|
|
|
machine_uint_t end = haystack_len;
|
2014-01-12 16:53:52 -05:00
|
|
|
if (n_args >= 3 && args[2] != mp_const_none) {
|
2014-03-29 09:43:38 -04:00
|
|
|
start = mp_get_index(&mp_type_str, haystack_len, args[2], true);
|
2014-01-12 16:53:52 -05:00
|
|
|
}
|
|
|
|
if (n_args >= 4 && args[3] != mp_const_none) {
|
2014-03-29 09:43:38 -04:00
|
|
|
end = mp_get_index(&mp_type_str, haystack_len, args[3], true);
|
2014-01-12 16:53:52 -05:00
|
|
|
}
|
|
|
|
|
2014-03-24 02:31:58 -04:00
|
|
|
const byte *p = find_subbytes(haystack + start, end - start, needle, needle_len, direction);
|
2014-01-13 14:39:01 -05:00
|
|
|
if (p == NULL) {
|
|
|
|
// not found
|
|
|
|
return MP_OBJ_NEW_SMALL_INT(-1);
|
|
|
|
} else {
|
|
|
|
// found
|
2014-03-24 02:31:58 -04:00
|
|
|
return MP_OBJ_NEW_SMALL_INT(p - haystack);
|
2014-01-12 16:53:52 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-03-24 02:31:58 -04:00
|
|
|
STATIC mp_obj_t str_find(uint n_args, const mp_obj_t *args) {
|
|
|
|
return str_finder(n_args, args, 1);
|
|
|
|
}
|
|
|
|
|
|
|
|
STATIC mp_obj_t str_rfind(uint n_args, const mp_obj_t *args) {
|
|
|
|
return str_finder(n_args, args, -1);
|
|
|
|
}
|
|
|
|
|
2014-01-22 18:20:40 -05:00
|
|
|
// TODO: (Much) more variety in args
|
2014-02-12 11:15:40 -05:00
|
|
|
STATIC mp_obj_t str_startswith(mp_obj_t self_in, mp_obj_t arg) {
|
2014-01-22 18:20:40 -05:00
|
|
|
GET_STR_DATA_LEN(self_in, str, str_len);
|
|
|
|
GET_STR_DATA_LEN(arg, prefix, prefix_len);
|
|
|
|
if (prefix_len > str_len) {
|
|
|
|
return mp_const_false;
|
|
|
|
}
|
|
|
|
return MP_BOOL(memcmp(str, prefix, prefix_len) == 0);
|
|
|
|
}
|
|
|
|
|
2014-02-12 11:15:40 -05:00
|
|
|
STATIC mp_obj_t str_strip(uint n_args, const mp_obj_t *args) {
|
2014-01-08 17:23:45 -05:00
|
|
|
assert(1 <= n_args && n_args <= 2);
|
2014-01-22 09:35:10 -05:00
|
|
|
assert(MP_OBJ_IS_STR(args[0]));
|
|
|
|
|
|
|
|
const byte *chars_to_del;
|
|
|
|
uint chars_to_del_len;
|
|
|
|
static const byte whitespace[] = " \t\n\r\v\f";
|
2014-01-08 17:23:45 -05:00
|
|
|
|
|
|
|
if (n_args == 1) {
|
|
|
|
chars_to_del = whitespace;
|
2014-01-22 09:35:10 -05:00
|
|
|
chars_to_del_len = sizeof(whitespace);
|
2014-01-08 17:23:45 -05:00
|
|
|
} else {
|
2014-01-22 09:35:10 -05:00
|
|
|
assert(MP_OBJ_IS_STR(args[1]));
|
|
|
|
GET_STR_DATA_LEN(args[1], s, l);
|
|
|
|
chars_to_del = s;
|
|
|
|
chars_to_del_len = l;
|
2014-01-08 17:23:45 -05:00
|
|
|
}
|
|
|
|
|
2014-01-22 09:35:10 -05:00
|
|
|
GET_STR_DATA_LEN(args[0], orig_str, orig_str_len);
|
2014-01-08 17:23:45 -05:00
|
|
|
|
2014-03-16 20:58:35 -04:00
|
|
|
machine_uint_t first_good_char_pos = 0;
|
2014-01-08 17:23:45 -05:00
|
|
|
bool first_good_char_pos_set = false;
|
2014-03-16 20:58:35 -04:00
|
|
|
machine_uint_t last_good_char_pos = 0;
|
|
|
|
for (machine_uint_t i = 0; i < orig_str_len; i++) {
|
2014-03-24 02:31:58 -04:00
|
|
|
if (find_subbytes(chars_to_del, chars_to_del_len, &orig_str[i], 1, 1) == NULL) {
|
2014-01-08 17:23:45 -05:00
|
|
|
last_good_char_pos = i;
|
|
|
|
if (!first_good_char_pos_set) {
|
|
|
|
first_good_char_pos = i;
|
|
|
|
first_good_char_pos_set = true;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (first_good_char_pos == 0 && last_good_char_pos == 0) {
|
2014-01-22 09:35:10 -05:00
|
|
|
// string is all whitespace, return ''
|
|
|
|
return MP_OBJ_NEW_QSTR(MP_QSTR_);
|
2014-01-08 17:23:45 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
assert(last_good_char_pos >= first_good_char_pos);
|
|
|
|
//+1 to accomodate the last character
|
2014-03-16 20:58:35 -04:00
|
|
|
machine_uint_t stripped_len = last_good_char_pos - first_good_char_pos + 1;
|
2014-01-22 09:35:10 -05:00
|
|
|
return mp_obj_new_str(orig_str + first_good_char_pos, stripped_len, false);
|
2014-01-08 17:23:45 -05:00
|
|
|
}
|
|
|
|
|
2014-03-31 00:06:50 -04:00
|
|
|
// Takes an int arg, but only parses unsigned numbers, and only changes
|
|
|
|
// *num if at least one digit was parsed.
|
|
|
|
static int str_to_int(const char *str, int *num) {
|
|
|
|
const char *s = str;
|
|
|
|
if (unichar_isdigit(*s)) {
|
|
|
|
*num = 0;
|
|
|
|
do {
|
|
|
|
*num = *num * 10 + (*s - '0');
|
|
|
|
s++;
|
|
|
|
}
|
|
|
|
while (unichar_isdigit(*s));
|
|
|
|
}
|
|
|
|
return s - str;
|
|
|
|
}
|
|
|
|
|
|
|
|
static bool isalignment(char ch) {
|
|
|
|
return ch && strchr("<>=^", ch) != NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
static bool istype(char ch) {
|
|
|
|
return ch && strchr("bcdeEfFgGnosxX%", ch) != NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
static bool arg_looks_integer(mp_obj_t arg) {
|
|
|
|
return MP_OBJ_IS_TYPE(arg, &mp_type_bool) || MP_OBJ_IS_INT(arg);
|
|
|
|
}
|
|
|
|
|
|
|
|
static bool arg_looks_numeric(mp_obj_t arg) {
|
|
|
|
return arg_looks_integer(arg)
|
|
|
|
#if MICROPY_ENABLE_FLOAT
|
|
|
|
|| MP_OBJ_IS_TYPE(arg, &mp_type_float)
|
|
|
|
#endif
|
|
|
|
;
|
|
|
|
}
|
|
|
|
|
2014-04-05 11:21:45 -04:00
|
|
|
static machine_int_t arg_as_int(mp_obj_t arg) {
|
|
|
|
#if MICROPY_ENABLE_FLOAT
|
|
|
|
if (MP_OBJ_IS_TYPE(arg, &mp_type_float)) {
|
|
|
|
return mp_obj_get_float(arg);
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
return mp_obj_get_int(arg);
|
|
|
|
}
|
|
|
|
|
2014-01-19 11:02:09 -05:00
|
|
|
mp_obj_t str_format(uint n_args, const mp_obj_t *args) {
|
2014-01-22 09:35:10 -05:00
|
|
|
assert(MP_OBJ_IS_STR(args[0]));
|
2013-12-21 13:17:45 -05:00
|
|
|
|
2014-01-22 09:35:10 -05:00
|
|
|
GET_STR_DATA_LEN(args[0], str, len);
|
2014-03-31 00:06:50 -04:00
|
|
|
int arg_i = 0;
|
2013-12-21 13:17:45 -05:00
|
|
|
vstr_t *vstr = vstr_new();
|
2014-03-31 00:06:50 -04:00
|
|
|
pfenv_t pfenv_vstr;
|
|
|
|
pfenv_vstr.data = vstr;
|
|
|
|
pfenv_vstr.print_strn = pfenv_vstr_add_strn;
|
|
|
|
|
2014-01-22 09:35:10 -05:00
|
|
|
for (const byte *top = str + len; str < top; str++) {
|
2014-03-31 00:06:50 -04:00
|
|
|
if (*str == '}') {
|
|
|
|
str++;
|
|
|
|
if (str < top && *str == '}') {
|
|
|
|
vstr_add_char(vstr, '}');
|
|
|
|
continue;
|
|
|
|
}
|
2014-04-05 13:32:08 -04:00
|
|
|
nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "Single '}' encountered in format string"));
|
2014-03-31 00:06:50 -04:00
|
|
|
}
|
|
|
|
if (*str != '{') {
|
|
|
|
vstr_add_char(vstr, *str);
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
str++;
|
|
|
|
if (str < top && *str == '{') {
|
|
|
|
vstr_add_char(vstr, '{');
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
// replacement_field ::= "{" [field_name] ["!" conversion] [":" format_spec] "}"
|
|
|
|
|
|
|
|
vstr_t *field_name = NULL;
|
|
|
|
char conversion = '\0';
|
|
|
|
vstr_t *format_spec = NULL;
|
|
|
|
|
|
|
|
if (str < top && *str != '}' && *str != '!' && *str != ':') {
|
|
|
|
field_name = vstr_new();
|
|
|
|
while (str < top && *str != '}' && *str != '!' && *str != ':') {
|
|
|
|
vstr_add_char(field_name, *str++);
|
|
|
|
}
|
|
|
|
vstr_add_char(field_name, '\0');
|
|
|
|
}
|
|
|
|
|
|
|
|
// conversion ::= "r" | "s"
|
|
|
|
|
|
|
|
if (str < top && *str == '!') {
|
2013-12-21 13:17:45 -05:00
|
|
|
str++;
|
2014-03-31 00:06:50 -04:00
|
|
|
if (str < top && (*str == 'r' || *str == 's')) {
|
|
|
|
conversion = *str++;
|
2014-01-15 15:45:20 -05:00
|
|
|
} else {
|
2014-04-05 13:32:08 -04:00
|
|
|
nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "end of format while looking for conversion specifier"));
|
2014-03-31 00:06:50 -04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (str < top && *str == ':') {
|
|
|
|
str++;
|
|
|
|
// {:} is the same as {}, which is the same as {!s}
|
|
|
|
// This makes a difference when passing in a True or False
|
|
|
|
// '{}'.format(True) returns 'True'
|
|
|
|
// '{:d}'.format(True) returns '1'
|
|
|
|
// So we treat {:} as {} and this later gets treated to be {!s}
|
|
|
|
if (*str != '}') {
|
|
|
|
format_spec = vstr_new();
|
|
|
|
while (str < top && *str != '}') {
|
|
|
|
vstr_add_char(format_spec, *str++);
|
2013-12-21 13:17:45 -05:00
|
|
|
}
|
2014-03-31 00:06:50 -04:00
|
|
|
vstr_add_char(format_spec, '\0');
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (str >= top) {
|
2014-04-05 13:32:08 -04:00
|
|
|
nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "unmatched '{' in format"));
|
2014-03-31 00:06:50 -04:00
|
|
|
}
|
|
|
|
if (*str != '}') {
|
2014-04-05 13:32:08 -04:00
|
|
|
nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "expected ':' after format specifier"));
|
2014-03-31 00:06:50 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
mp_obj_t arg = mp_const_none;
|
|
|
|
|
|
|
|
if (field_name) {
|
|
|
|
if (arg_i > 0) {
|
2014-04-05 13:32:08 -04:00
|
|
|
nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "cannot switch from automatic field numbering to manual field specification"));
|
2014-03-31 00:06:50 -04:00
|
|
|
}
|
|
|
|
int index;
|
|
|
|
if (str_to_int(vstr_str(field_name), &index) != vstr_len(field_name) - 1) {
|
2014-04-05 13:32:08 -04:00
|
|
|
nlr_raise(mp_obj_new_exception_msg(&mp_type_KeyError, "attributes not supported yet"));
|
2013-12-21 13:17:45 -05:00
|
|
|
}
|
2014-03-31 00:06:50 -04:00
|
|
|
if (index >= n_args - 1) {
|
2014-04-05 13:32:08 -04:00
|
|
|
nlr_raise(mp_obj_new_exception_msg(&mp_type_IndexError, "tuple index out of range"));
|
2014-03-31 00:06:50 -04:00
|
|
|
}
|
|
|
|
arg = args[index + 1];
|
|
|
|
arg_i = -1;
|
|
|
|
vstr_free(field_name);
|
|
|
|
field_name = NULL;
|
2013-12-21 13:17:45 -05:00
|
|
|
} else {
|
2014-03-31 00:06:50 -04:00
|
|
|
if (arg_i < 0) {
|
2014-04-05 13:32:08 -04:00
|
|
|
nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "cannot switch from manual field specification to automatic field numbering"));
|
2014-03-31 00:06:50 -04:00
|
|
|
}
|
|
|
|
if (arg_i >= n_args - 1) {
|
2014-04-05 13:32:08 -04:00
|
|
|
nlr_raise(mp_obj_new_exception_msg(&mp_type_IndexError, "tuple index out of range"));
|
2014-03-31 00:06:50 -04:00
|
|
|
}
|
|
|
|
arg = args[arg_i + 1];
|
|
|
|
arg_i++;
|
|
|
|
}
|
|
|
|
if (!format_spec && !conversion) {
|
|
|
|
conversion = 's';
|
|
|
|
}
|
|
|
|
if (conversion) {
|
|
|
|
mp_print_kind_t print_kind;
|
|
|
|
if (conversion == 's') {
|
|
|
|
print_kind = PRINT_STR;
|
|
|
|
} else if (conversion == 'r') {
|
|
|
|
print_kind = PRINT_REPR;
|
|
|
|
} else {
|
2014-04-05 13:32:08 -04:00
|
|
|
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ValueError, "Unknown conversion specifier %c", conversion));
|
2014-03-31 00:06:50 -04:00
|
|
|
}
|
|
|
|
vstr_t *arg_vstr = vstr_new();
|
|
|
|
mp_obj_print_helper((void (*)(void*, const char*, ...))vstr_printf, arg_vstr, arg, print_kind);
|
|
|
|
arg = mp_obj_new_str((const byte *)vstr_str(arg_vstr), vstr_len(arg_vstr), false);
|
|
|
|
vstr_free(arg_vstr);
|
|
|
|
}
|
|
|
|
|
|
|
|
char sign = '\0';
|
|
|
|
char fill = '\0';
|
|
|
|
char align = '\0';
|
|
|
|
int width = -1;
|
|
|
|
int precision = -1;
|
|
|
|
char type = '\0';
|
|
|
|
int flags = 0;
|
|
|
|
|
|
|
|
if (format_spec) {
|
|
|
|
// The format specifier (from http://docs.python.org/2/library/string.html#formatspec)
|
|
|
|
//
|
|
|
|
// [[fill]align][sign][#][0][width][,][.precision][type]
|
|
|
|
// fill ::= <any character>
|
|
|
|
// align ::= "<" | ">" | "=" | "^"
|
|
|
|
// sign ::= "+" | "-" | " "
|
|
|
|
// width ::= integer
|
|
|
|
// precision ::= integer
|
|
|
|
// type ::= "b" | "c" | "d" | "e" | "E" | "f" | "F" | "g" | "G" | "n" | "o" | "s" | "x" | "X" | "%"
|
|
|
|
|
|
|
|
const char *s = vstr_str(format_spec);
|
|
|
|
if (isalignment(*s)) {
|
|
|
|
align = *s++;
|
|
|
|
} else if (*s && isalignment(s[1])) {
|
|
|
|
fill = *s++;
|
|
|
|
align = *s++;
|
|
|
|
}
|
|
|
|
if (*s == '+' || *s == '-' || *s == ' ') {
|
|
|
|
if (*s == '+') {
|
|
|
|
flags |= PF_FLAG_SHOW_SIGN;
|
|
|
|
} else if (*s == ' ') {
|
|
|
|
flags |= PF_FLAG_SPACE_SIGN;
|
|
|
|
}
|
|
|
|
sign = *s++;
|
|
|
|
}
|
|
|
|
if (*s == '#') {
|
|
|
|
flags |= PF_FLAG_SHOW_PREFIX;
|
|
|
|
s++;
|
|
|
|
}
|
|
|
|
if (*s == '0') {
|
|
|
|
if (!align) {
|
|
|
|
align = '=';
|
|
|
|
}
|
|
|
|
if (!fill) {
|
|
|
|
fill = '0';
|
|
|
|
}
|
|
|
|
}
|
|
|
|
s += str_to_int(s, &width);
|
|
|
|
if (*s == ',') {
|
|
|
|
flags |= PF_FLAG_SHOW_COMMA;
|
|
|
|
s++;
|
|
|
|
}
|
|
|
|
if (*s == '.') {
|
|
|
|
s++;
|
|
|
|
s += str_to_int(s, &precision);
|
|
|
|
}
|
|
|
|
if (istype(*s)) {
|
|
|
|
type = *s++;
|
|
|
|
}
|
|
|
|
if (*s) {
|
2014-04-05 13:32:08 -04:00
|
|
|
nlr_raise(mp_obj_new_exception_msg(&mp_type_KeyError, "Invalid conversion specification"));
|
2014-03-31 00:06:50 -04:00
|
|
|
}
|
|
|
|
vstr_free(format_spec);
|
|
|
|
format_spec = NULL;
|
|
|
|
}
|
|
|
|
if (!align) {
|
|
|
|
if (arg_looks_numeric(arg)) {
|
|
|
|
align = '>';
|
|
|
|
} else {
|
|
|
|
align = '<';
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (!fill) {
|
|
|
|
fill = ' ';
|
|
|
|
}
|
|
|
|
|
|
|
|
if (sign) {
|
|
|
|
if (type == 's') {
|
2014-04-05 13:32:08 -04:00
|
|
|
nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "Sign not allowed in string format specifier"));
|
2014-03-31 00:06:50 -04:00
|
|
|
}
|
|
|
|
if (type == 'c') {
|
2014-04-05 13:32:08 -04:00
|
|
|
nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "Sign not allowed with integer format specifier 'c'"));
|
2014-03-31 00:06:50 -04:00
|
|
|
}
|
|
|
|
} else {
|
|
|
|
sign = '-';
|
|
|
|
}
|
|
|
|
|
|
|
|
switch (align) {
|
|
|
|
case '<': flags |= PF_FLAG_LEFT_ADJUST; break;
|
|
|
|
case '=': flags |= PF_FLAG_PAD_AFTER_SIGN; break;
|
|
|
|
case '^': flags |= PF_FLAG_CENTER_ADJUST; break;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (arg_looks_integer(arg)) {
|
|
|
|
switch (type) {
|
|
|
|
case 'b':
|
|
|
|
pfenv_print_int(&pfenv_vstr, mp_obj_get_int(arg), 1, 2, 'a', flags, fill, width);
|
|
|
|
continue;
|
|
|
|
|
|
|
|
case 'c':
|
|
|
|
{
|
|
|
|
char ch = mp_obj_get_int(arg);
|
|
|
|
pfenv_print_strn(&pfenv_vstr, &ch, 1, flags, fill, width);
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
case '\0': // No explicit format type implies 'd'
|
|
|
|
case 'n': // I don't think we support locales in uPy so use 'd'
|
|
|
|
case 'd':
|
|
|
|
pfenv_print_int(&pfenv_vstr, mp_obj_get_int(arg), 1, 10, 'a', flags, fill, width);
|
|
|
|
continue;
|
|
|
|
|
|
|
|
case 'o':
|
|
|
|
pfenv_print_int(&pfenv_vstr, mp_obj_get_int(arg), 1, 8, 'a', flags, fill, width);
|
|
|
|
continue;
|
|
|
|
|
|
|
|
case 'x':
|
|
|
|
pfenv_print_int(&pfenv_vstr, mp_obj_get_int(arg), 1, 16, 'a', flags, fill, width);
|
|
|
|
continue;
|
|
|
|
|
|
|
|
case 'X':
|
|
|
|
pfenv_print_int(&pfenv_vstr, mp_obj_get_int(arg), 1, 16, 'A', flags, fill, width);
|
|
|
|
continue;
|
|
|
|
|
|
|
|
case 'e':
|
|
|
|
case 'E':
|
|
|
|
case 'f':
|
|
|
|
case 'F':
|
|
|
|
case 'g':
|
|
|
|
case 'G':
|
|
|
|
case '%':
|
|
|
|
// The floating point formatters all work with anything that
|
|
|
|
// looks like an integer
|
|
|
|
break;
|
|
|
|
|
|
|
|
default:
|
2014-04-05 13:32:08 -04:00
|
|
|
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ValueError,
|
2014-03-31 00:06:50 -04:00
|
|
|
"Unknown format code '%c' for object of type '%s'", type, mp_obj_get_type_str(arg)));
|
|
|
|
}
|
2014-04-02 15:04:15 -04:00
|
|
|
}
|
2014-04-02 12:06:05 -04:00
|
|
|
|
2014-04-02 15:07:31 -04:00
|
|
|
// NOTE: no else here. We need the e, f, g etc formats for integer
|
|
|
|
// arguments (from above if) to take this if.
|
2014-04-02 15:04:15 -04:00
|
|
|
if (arg_looks_numeric(arg)) {
|
2014-03-31 00:06:50 -04:00
|
|
|
if (!type) {
|
|
|
|
|
|
|
|
// Even though the docs say that an unspecified type is the same
|
|
|
|
// as 'g', there is one subtle difference, when the exponent
|
|
|
|
// is one less than the precision.
|
|
|
|
//
|
|
|
|
// '{:10.1}'.format(0.0) ==> '0e+00'
|
|
|
|
// '{:10.1g}'.format(0.0) ==> '0'
|
|
|
|
//
|
|
|
|
// TODO: Figure out how to deal with this.
|
|
|
|
//
|
|
|
|
// A proper solution would involve adding a special flag
|
|
|
|
// or something to format_float, and create a format_double
|
|
|
|
// to deal with doubles. In order to fix this when using
|
|
|
|
// sprintf, we'd need to use the e format and tweak the
|
|
|
|
// returned result to strip trailing zeros like the g format
|
|
|
|
// does.
|
|
|
|
//
|
|
|
|
// {:10.3} and {:10.2e} with 1.23e2 both produce 1.23e+02
|
|
|
|
// but with 1.e2 you get 1e+02 and 1.00e+02
|
|
|
|
//
|
|
|
|
// Stripping the trailing 0's (like g) does would make the
|
|
|
|
// e format give us the right format.
|
|
|
|
//
|
|
|
|
// CPython sources say:
|
|
|
|
// Omitted type specifier. Behaves in the same way as repr(x)
|
|
|
|
// and str(x) if no precision is given, else like 'g', but with
|
|
|
|
// at least one digit after the decimal point. */
|
|
|
|
|
|
|
|
type = 'g';
|
|
|
|
}
|
|
|
|
if (type == 'n') {
|
|
|
|
type = 'g';
|
|
|
|
}
|
|
|
|
|
|
|
|
flags |= PF_FLAG_PAD_NAN_INF; // '{:06e}'.format(float('-inf')) should give '-00inf'
|
|
|
|
switch (type) {
|
2014-04-02 15:04:15 -04:00
|
|
|
#if MICROPY_ENABLE_FLOAT
|
2014-03-31 00:06:50 -04:00
|
|
|
case 'e':
|
|
|
|
case 'E':
|
|
|
|
case 'f':
|
|
|
|
case 'F':
|
|
|
|
case 'g':
|
|
|
|
case 'G':
|
|
|
|
pfenv_print_float(&pfenv_vstr, mp_obj_get_float(arg), type, flags, fill, width, precision);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case '%':
|
|
|
|
flags |= PF_FLAG_ADD_PERCENT;
|
|
|
|
pfenv_print_float(&pfenv_vstr, mp_obj_get_float(arg) * 100.0F, 'f', flags, fill, width, precision);
|
|
|
|
break;
|
2014-04-02 15:04:15 -04:00
|
|
|
#endif
|
2014-03-31 00:06:50 -04:00
|
|
|
|
|
|
|
default:
|
2014-04-05 13:32:08 -04:00
|
|
|
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ValueError,
|
2014-03-31 00:06:50 -04:00
|
|
|
"Unknown format code '%c' for object of type 'float'",
|
|
|
|
type, mp_obj_get_type_str(arg)));
|
|
|
|
}
|
|
|
|
} else {
|
2014-04-02 12:06:05 -04:00
|
|
|
// arg doesn't look like a number
|
|
|
|
|
2014-03-31 00:06:50 -04:00
|
|
|
if (align == '=') {
|
2014-04-05 13:32:08 -04:00
|
|
|
nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "'=' alignment not allowed in string format specifier"));
|
2014-03-31 00:06:50 -04:00
|
|
|
}
|
2014-04-02 12:06:05 -04:00
|
|
|
|
2014-03-31 00:06:50 -04:00
|
|
|
switch (type) {
|
|
|
|
case '\0':
|
|
|
|
mp_obj_print_helper((void (*)(void*, const char*, ...))vstr_printf, vstr, arg, PRINT_STR);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case 's':
|
|
|
|
{
|
|
|
|
uint len;
|
|
|
|
const char *s = mp_obj_str_get_data(arg, &len);
|
|
|
|
if (precision < 0) {
|
|
|
|
precision = len;
|
|
|
|
}
|
|
|
|
if (len > precision) {
|
|
|
|
len = precision;
|
|
|
|
}
|
|
|
|
pfenv_print_strn(&pfenv_vstr, s, len, flags, fill, width);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
default:
|
2014-04-05 13:32:08 -04:00
|
|
|
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ValueError,
|
2014-03-31 00:06:50 -04:00
|
|
|
"Unknown format code '%c' for object of type 'str'",
|
|
|
|
type, mp_obj_get_type_str(arg)));
|
|
|
|
}
|
2013-12-21 13:17:45 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-01-22 09:35:10 -05:00
|
|
|
mp_obj_t s = mp_obj_new_str((byte*)vstr->buf, vstr->len, false);
|
|
|
|
vstr_free(vstr);
|
|
|
|
return s;
|
2013-12-21 13:17:45 -05:00
|
|
|
}
|
|
|
|
|
2014-03-31 14:18:28 -04:00
|
|
|
STATIC mp_obj_t str_modulo_format(mp_obj_t pattern, uint n_args, const mp_obj_t *args) {
|
|
|
|
assert(MP_OBJ_IS_STR(pattern));
|
|
|
|
|
|
|
|
GET_STR_DATA_LEN(pattern, str, len);
|
2014-04-02 14:42:39 -04:00
|
|
|
const byte *start_str = str;
|
2014-03-31 14:18:28 -04:00
|
|
|
int arg_i = 0;
|
|
|
|
vstr_t *vstr = vstr_new();
|
2014-04-02 14:42:39 -04:00
|
|
|
pfenv_t pfenv_vstr;
|
|
|
|
pfenv_vstr.data = vstr;
|
|
|
|
pfenv_vstr.print_strn = pfenv_vstr_add_strn;
|
|
|
|
|
2014-03-31 14:18:28 -04:00
|
|
|
for (const byte *top = str + len; str < top; str++) {
|
2014-04-02 14:42:39 -04:00
|
|
|
if (*str != '%') {
|
|
|
|
vstr_add_char(vstr, *str);
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
if (++str >= top) {
|
|
|
|
break;
|
|
|
|
}
|
2014-03-31 14:18:28 -04:00
|
|
|
if (*str == '%') {
|
2014-04-02 14:42:39 -04:00
|
|
|
vstr_add_char(vstr, '%');
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
if (arg_i >= n_args) {
|
2014-04-05 13:32:08 -04:00
|
|
|
nlr_raise(mp_obj_new_exception_msg(&mp_type_TypeError, "not enough arguments for format string"));
|
2014-04-02 14:42:39 -04:00
|
|
|
}
|
|
|
|
int flags = 0;
|
|
|
|
char fill = ' ';
|
|
|
|
bool alt = false;
|
|
|
|
while (str < top) {
|
|
|
|
if (*str == '-') flags |= PF_FLAG_LEFT_ADJUST;
|
|
|
|
else if (*str == '+') flags |= PF_FLAG_SHOW_SIGN;
|
|
|
|
else if (*str == ' ') flags |= PF_FLAG_SPACE_SIGN;
|
|
|
|
else if (*str == '#') alt = true;
|
|
|
|
else if (*str == '0') {
|
|
|
|
flags |= PF_FLAG_PAD_AFTER_SIGN;
|
|
|
|
fill = '0';
|
|
|
|
} else break;
|
|
|
|
str++;
|
|
|
|
}
|
|
|
|
// parse width, if it exists
|
|
|
|
int width = 0;
|
|
|
|
if (str < top) {
|
|
|
|
if (*str == '*') {
|
|
|
|
width = mp_obj_get_int(args[arg_i++]);
|
|
|
|
str++;
|
2014-03-31 14:18:28 -04:00
|
|
|
} else {
|
2014-04-02 14:42:39 -04:00
|
|
|
for (; str < top && '0' <= *str && *str <= '9'; str++) {
|
|
|
|
width = width * 10 + *str - '0';
|
2014-03-31 14:18:28 -04:00
|
|
|
}
|
2014-04-02 14:42:39 -04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
int prec = -1;
|
|
|
|
if (str < top && *str == '.') {
|
|
|
|
if (++str < top) {
|
|
|
|
if (*str == '*') {
|
|
|
|
prec = mp_obj_get_int(args[arg_i++]);
|
|
|
|
str++;
|
|
|
|
} else {
|
|
|
|
prec = 0;
|
|
|
|
for (; str < top && '0' <= *str && *str <= '9'; str++) {
|
|
|
|
prec = prec * 10 + *str - '0';
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (str >= top) {
|
2014-04-05 13:32:08 -04:00
|
|
|
nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "incomplete format"));
|
2014-04-02 14:42:39 -04:00
|
|
|
}
|
|
|
|
mp_obj_t arg = args[arg_i];
|
|
|
|
switch (*str) {
|
|
|
|
case 'c':
|
|
|
|
if (MP_OBJ_IS_STR(arg)) {
|
|
|
|
uint len;
|
|
|
|
const char *s = mp_obj_str_get_data(arg, &len);
|
|
|
|
if (len != 1) {
|
2014-04-05 13:32:08 -04:00
|
|
|
nlr_raise(mp_obj_new_exception_msg(&mp_type_TypeError, "%c requires int or char"));
|
2014-03-31 14:18:28 -04:00
|
|
|
break;
|
2014-04-02 14:42:39 -04:00
|
|
|
}
|
|
|
|
pfenv_print_strn(&pfenv_vstr, s, 1, flags, ' ', width);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
if (arg_looks_integer(arg)) {
|
|
|
|
char ch = mp_obj_get_int(arg);
|
|
|
|
pfenv_print_strn(&pfenv_vstr, &ch, 1, flags, ' ', width);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
#if MICROPY_ENABLE_FLOAT
|
|
|
|
// This is what CPython reports, so we report the same.
|
|
|
|
if (MP_OBJ_IS_TYPE(arg, &mp_type_float)) {
|
2014-04-05 13:32:08 -04:00
|
|
|
nlr_raise(mp_obj_new_exception_msg(&mp_type_TypeError, "integer argument expected, got float"));
|
2014-04-02 14:42:39 -04:00
|
|
|
|
|
|
|
}
|
|
|
|
#endif
|
2014-04-05 13:32:08 -04:00
|
|
|
nlr_raise(mp_obj_new_exception_msg(&mp_type_TypeError, "an integer is required"));
|
2014-04-02 14:42:39 -04:00
|
|
|
break;
|
|
|
|
|
|
|
|
case 'd':
|
|
|
|
case 'i':
|
|
|
|
case 'u':
|
2014-04-05 11:21:45 -04:00
|
|
|
pfenv_print_int(&pfenv_vstr, arg_as_int(arg), 1, 10, 'a', flags, fill, width);
|
2014-04-02 14:42:39 -04:00
|
|
|
break;
|
|
|
|
|
|
|
|
#if MICROPY_ENABLE_FLOAT
|
|
|
|
case 'e':
|
|
|
|
case 'E':
|
|
|
|
case 'f':
|
|
|
|
case 'F':
|
|
|
|
case 'g':
|
|
|
|
case 'G':
|
|
|
|
pfenv_print_float(&pfenv_vstr, mp_obj_get_float(arg), *str, flags, fill, width, prec);
|
|
|
|
break;
|
|
|
|
#endif
|
|
|
|
|
|
|
|
case 'o':
|
|
|
|
if (alt) {
|
|
|
|
flags |= PF_FLAG_SHOW_PREFIX;
|
|
|
|
}
|
2014-04-05 11:21:45 -04:00
|
|
|
pfenv_print_int(&pfenv_vstr, arg_as_int(arg), 1, 8, 'a', flags, fill, width);
|
2014-04-02 14:42:39 -04:00
|
|
|
break;
|
|
|
|
|
|
|
|
case 'r':
|
|
|
|
case 's':
|
|
|
|
{
|
|
|
|
vstr_t *arg_vstr = vstr_new();
|
|
|
|
mp_obj_print_helper((void (*)(void*, const char*, ...))vstr_printf,
|
|
|
|
arg_vstr, arg, *str == 'r' ? PRINT_REPR : PRINT_STR);
|
|
|
|
uint len = vstr_len(arg_vstr);
|
|
|
|
if (prec < 0) {
|
|
|
|
prec = len;
|
|
|
|
}
|
|
|
|
if (len > prec) {
|
|
|
|
len = prec;
|
2014-03-31 14:18:28 -04:00
|
|
|
}
|
2014-04-02 14:42:39 -04:00
|
|
|
pfenv_print_strn(&pfenv_vstr, vstr_str(arg_vstr), len, flags, ' ', width);
|
|
|
|
vstr_free(arg_vstr);
|
|
|
|
break;
|
2014-03-31 14:18:28 -04:00
|
|
|
}
|
2014-04-02 14:42:39 -04:00
|
|
|
|
|
|
|
case 'x':
|
|
|
|
if (alt) {
|
|
|
|
flags |= PF_FLAG_SHOW_PREFIX;
|
|
|
|
}
|
2014-04-05 11:21:45 -04:00
|
|
|
pfenv_print_int(&pfenv_vstr, arg_as_int(arg), 1, 16, 'a', flags, fill, width);
|
2014-04-02 14:42:39 -04:00
|
|
|
break;
|
|
|
|
|
|
|
|
case 'X':
|
|
|
|
if (alt) {
|
|
|
|
flags |= PF_FLAG_SHOW_PREFIX;
|
|
|
|
}
|
2014-04-05 11:21:45 -04:00
|
|
|
pfenv_print_int(&pfenv_vstr, arg_as_int(arg), 1, 16, 'A', flags, fill, width);
|
2014-04-02 14:42:39 -04:00
|
|
|
break;
|
|
|
|
|
|
|
|
default:
|
2014-04-05 13:32:08 -04:00
|
|
|
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_ValueError,
|
2014-04-02 14:42:39 -04:00
|
|
|
"unsupported format character '%c' (0x%x) at index %d",
|
|
|
|
*str, *str, str - start_str));
|
2014-03-31 14:18:28 -04:00
|
|
|
}
|
2014-04-02 14:42:39 -04:00
|
|
|
arg_i++;
|
2014-03-31 14:18:28 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
if (arg_i != n_args) {
|
2014-04-05 13:32:08 -04:00
|
|
|
nlr_raise(mp_obj_new_exception_msg(&mp_type_TypeError, "not all arguments converted during string formatting"));
|
2014-03-31 14:18:28 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
mp_obj_t s = mp_obj_new_str((byte*)vstr->buf, vstr->len, false);
|
|
|
|
vstr_free(vstr);
|
|
|
|
return s;
|
|
|
|
}
|
|
|
|
|
2014-02-12 11:15:40 -05:00
|
|
|
STATIC mp_obj_t str_replace(uint n_args, const mp_obj_t *args) {
|
2014-01-31 01:17:30 -05:00
|
|
|
assert(MP_OBJ_IS_STR(args[0]));
|
|
|
|
assert(MP_OBJ_IS_STR(args[1]));
|
|
|
|
assert(MP_OBJ_IS_STR(args[2]));
|
|
|
|
|
2014-01-31 18:45:12 -05:00
|
|
|
machine_int_t max_rep = 0;
|
2014-01-31 01:17:30 -05:00
|
|
|
if (n_args == 4) {
|
2014-02-11 08:29:55 -05:00
|
|
|
assert(MP_OBJ_IS_SMALL_INT(args[3]));
|
|
|
|
max_rep = MP_OBJ_SMALL_INT_VALUE(args[3]);
|
|
|
|
if (max_rep == 0) {
|
|
|
|
return args[0];
|
|
|
|
} else if (max_rep < 0) {
|
|
|
|
max_rep = 0;
|
|
|
|
}
|
2014-01-31 01:17:30 -05:00
|
|
|
}
|
2014-01-31 18:45:12 -05:00
|
|
|
|
|
|
|
// if max_rep is still 0 by this point we will need to do all possible replacements
|
2014-01-31 01:17:30 -05:00
|
|
|
|
|
|
|
GET_STR_DATA_LEN(args[0], str, str_len);
|
|
|
|
GET_STR_DATA_LEN(args[1], old, old_len);
|
|
|
|
GET_STR_DATA_LEN(args[2], new, new_len);
|
2014-01-31 18:45:12 -05:00
|
|
|
|
|
|
|
// old won't exist in str if it's longer, so nothing to replace
|
2014-01-31 01:17:30 -05:00
|
|
|
if (old_len > str_len) {
|
2014-02-11 08:29:55 -05:00
|
|
|
return args[0];
|
2014-01-31 01:17:30 -05:00
|
|
|
}
|
|
|
|
|
2014-01-31 18:45:12 -05:00
|
|
|
// data for the replaced string
|
|
|
|
byte *data = NULL;
|
|
|
|
mp_obj_t replaced_str = MP_OBJ_NULL;
|
|
|
|
|
|
|
|
// do 2 passes over the string:
|
|
|
|
// first pass computes the required length of the replaced string
|
|
|
|
// second pass does the replacements
|
|
|
|
for (;;) {
|
|
|
|
machine_uint_t replaced_str_index = 0;
|
|
|
|
machine_uint_t num_replacements_done = 0;
|
|
|
|
const byte *old_occurrence;
|
|
|
|
const byte *offset_ptr = str;
|
|
|
|
machine_uint_t offset_num = 0;
|
2014-03-24 02:31:58 -04:00
|
|
|
while ((old_occurrence = find_subbytes(offset_ptr, str_len - offset_num, old, old_len, 1)) != NULL) {
|
2014-01-31 18:45:12 -05:00
|
|
|
// copy from just after end of last occurrence of to-be-replaced string to right before start of next occurrence
|
|
|
|
if (data != NULL) {
|
|
|
|
memcpy(data + replaced_str_index, offset_ptr, old_occurrence - offset_ptr);
|
|
|
|
}
|
|
|
|
replaced_str_index += old_occurrence - offset_ptr;
|
|
|
|
// copy the replacement string
|
|
|
|
if (data != NULL) {
|
|
|
|
memcpy(data + replaced_str_index, new, new_len);
|
|
|
|
}
|
|
|
|
replaced_str_index += new_len;
|
|
|
|
offset_ptr = old_occurrence + old_len;
|
|
|
|
offset_num = offset_ptr - str;
|
|
|
|
|
|
|
|
num_replacements_done++;
|
|
|
|
if (max_rep != 0 && num_replacements_done == max_rep){
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// copy from just after end of last occurrence of to-be-replaced string to end of old string
|
|
|
|
if (data != NULL) {
|
|
|
|
memcpy(data + replaced_str_index, offset_ptr, str_len - offset_num);
|
|
|
|
}
|
|
|
|
replaced_str_index += str_len - offset_num;
|
|
|
|
|
|
|
|
if (data == NULL) {
|
|
|
|
// first pass
|
|
|
|
if (num_replacements_done == 0) {
|
|
|
|
// no substr found, return original string
|
|
|
|
return args[0];
|
|
|
|
} else {
|
|
|
|
// substr found, allocate new string
|
|
|
|
replaced_str = mp_obj_str_builder_start(mp_obj_get_type(args[0]), replaced_str_index, &data);
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
// second pass, we are done
|
|
|
|
break;
|
|
|
|
}
|
2014-01-31 01:17:30 -05:00
|
|
|
}
|
2014-01-31 18:45:12 -05:00
|
|
|
|
2014-01-31 01:17:30 -05:00
|
|
|
return mp_obj_str_builder_end(replaced_str);
|
|
|
|
}
|
|
|
|
|
2014-03-13 01:57:16 -04:00
|
|
|
STATIC mp_obj_t str_count(uint n_args, const mp_obj_t *args) {
|
|
|
|
assert(2 <= n_args && n_args <= 4);
|
|
|
|
assert(MP_OBJ_IS_STR(args[0]));
|
|
|
|
assert(MP_OBJ_IS_STR(args[1]));
|
|
|
|
|
|
|
|
GET_STR_DATA_LEN(args[0], haystack, haystack_len);
|
|
|
|
GET_STR_DATA_LEN(args[1], needle, needle_len);
|
|
|
|
|
2014-03-13 18:07:55 -04:00
|
|
|
machine_uint_t start = 0;
|
|
|
|
machine_uint_t end = haystack_len;
|
2014-03-13 01:57:16 -04:00
|
|
|
if (n_args >= 3 && args[2] != mp_const_none) {
|
2014-03-29 09:43:38 -04:00
|
|
|
start = mp_get_index(&mp_type_str, haystack_len, args[2], true);
|
2014-03-13 01:57:16 -04:00
|
|
|
}
|
|
|
|
if (n_args >= 4 && args[3] != mp_const_none) {
|
2014-03-29 09:43:38 -04:00
|
|
|
end = mp_get_index(&mp_type_str, haystack_len, args[3], true);
|
2014-03-13 01:57:16 -04:00
|
|
|
}
|
|
|
|
|
2014-03-13 18:07:55 -04:00
|
|
|
// if needle_len is zero then we count each gap between characters as an occurrence
|
|
|
|
if (needle_len == 0) {
|
|
|
|
return MP_OBJ_NEW_SMALL_INT(end - start + 1);
|
2014-03-13 01:57:16 -04:00
|
|
|
}
|
|
|
|
|
2014-03-13 18:07:55 -04:00
|
|
|
// count the occurrences
|
|
|
|
machine_int_t num_occurrences = 0;
|
2014-03-13 03:29:15 -04:00
|
|
|
for (machine_uint_t haystack_index = start; haystack_index + needle_len <= end; haystack_index++) {
|
|
|
|
if (memcmp(&haystack[haystack_index], needle, needle_len) == 0) {
|
|
|
|
num_occurrences++;
|
|
|
|
haystack_index += needle_len - 1;
|
|
|
|
}
|
2014-03-13 01:57:16 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
return MP_OBJ_NEW_SMALL_INT(num_occurrences);
|
|
|
|
}
|
|
|
|
|
2014-03-21 16:39:40 -04:00
|
|
|
STATIC mp_obj_t str_partitioner(mp_obj_t self_in, mp_obj_t arg, machine_int_t direction) {
|
2014-03-18 03:06:29 -04:00
|
|
|
assert(MP_OBJ_IS_STR(self_in));
|
|
|
|
if (!MP_OBJ_IS_STR(arg)) {
|
2014-04-05 13:32:08 -04:00
|
|
|
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_TypeError,
|
2014-03-18 03:06:29 -04:00
|
|
|
"Can't convert '%s' object to str implicitly", mp_obj_get_type_str(arg)));
|
|
|
|
}
|
2014-03-21 16:39:40 -04:00
|
|
|
|
2014-03-18 03:06:29 -04:00
|
|
|
GET_STR_DATA_LEN(self_in, str, str_len);
|
|
|
|
GET_STR_DATA_LEN(arg, sep, sep_len);
|
|
|
|
|
|
|
|
if (sep_len == 0) {
|
2014-04-05 13:32:08 -04:00
|
|
|
nlr_raise(mp_obj_new_exception_msg(&mp_type_ValueError, "empty separator"));
|
2014-03-18 03:06:29 -04:00
|
|
|
}
|
2014-03-21 16:39:40 -04:00
|
|
|
|
|
|
|
mp_obj_t result[] = {MP_OBJ_NEW_QSTR(MP_QSTR_), MP_OBJ_NEW_QSTR(MP_QSTR_), MP_OBJ_NEW_QSTR(MP_QSTR_)};
|
|
|
|
|
|
|
|
if (direction > 0) {
|
|
|
|
result[0] = self_in;
|
2014-03-21 04:12:26 -04:00
|
|
|
} else {
|
2014-03-21 16:39:40 -04:00
|
|
|
result[2] = self_in;
|
2014-03-21 04:12:26 -04:00
|
|
|
}
|
2014-03-18 03:06:29 -04:00
|
|
|
|
2014-03-24 02:31:58 -04:00
|
|
|
const byte *position_ptr = find_subbytes(str, str_len, sep, sep_len, direction);
|
|
|
|
if (position_ptr != NULL) {
|
|
|
|
machine_uint_t position = position_ptr - str;
|
|
|
|
result[0] = mp_obj_new_str(str, position, false);
|
|
|
|
result[1] = arg;
|
|
|
|
result[2] = mp_obj_new_str(str + position + sep_len, str_len - position - sep_len, false);
|
2014-03-18 03:06:29 -04:00
|
|
|
}
|
2014-03-21 16:39:40 -04:00
|
|
|
|
2014-03-21 04:12:26 -04:00
|
|
|
return mp_obj_new_tuple(3, result);
|
2014-03-18 03:06:29 -04:00
|
|
|
}
|
|
|
|
|
2014-03-21 16:39:40 -04:00
|
|
|
STATIC mp_obj_t str_partition(mp_obj_t self_in, mp_obj_t arg) {
|
|
|
|
return str_partitioner(self_in, arg, 1);
|
2014-03-21 04:12:26 -04:00
|
|
|
}
|
2014-03-19 03:46:14 -04:00
|
|
|
|
2014-03-21 16:39:40 -04:00
|
|
|
STATIC mp_obj_t str_rpartition(mp_obj_t self_in, mp_obj_t arg) {
|
|
|
|
return str_partitioner(self_in, arg, -1);
|
2014-03-19 03:46:14 -04:00
|
|
|
}
|
|
|
|
|
2014-03-09 15:58:18 -04:00
|
|
|
STATIC machine_int_t str_get_buffer(mp_obj_t self_in, buffer_info_t *bufinfo, int flags) {
|
|
|
|
if (flags == BUFFER_READ) {
|
|
|
|
GET_STR_DATA_LEN(self_in, str_data, str_len);
|
|
|
|
bufinfo->buf = (void*)str_data;
|
|
|
|
bufinfo->len = str_len;
|
|
|
|
return 0;
|
|
|
|
} else {
|
|
|
|
// can't write to a string
|
|
|
|
bufinfo->buf = NULL;
|
|
|
|
bufinfo->len = 0;
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-02-12 11:15:40 -05:00
|
|
|
STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(str_find_obj, 2, 4, str_find);
|
2014-03-24 02:31:58 -04:00
|
|
|
STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(str_rfind_obj, 2, 4, str_rfind);
|
2014-02-12 11:15:40 -05:00
|
|
|
STATIC MP_DEFINE_CONST_FUN_OBJ_2(str_join_obj, str_join);
|
|
|
|
STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(str_split_obj, 1, 3, str_split);
|
|
|
|
STATIC MP_DEFINE_CONST_FUN_OBJ_2(str_startswith_obj, str_startswith);
|
|
|
|
STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(str_strip_obj, 1, 2, str_strip);
|
|
|
|
STATIC MP_DEFINE_CONST_FUN_OBJ_VAR(str_format_obj, 1, str_format);
|
|
|
|
STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(str_replace_obj, 3, 4, str_replace);
|
2014-03-13 01:57:16 -04:00
|
|
|
STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(str_count_obj, 2, 4, str_count);
|
2014-03-18 03:06:29 -04:00
|
|
|
STATIC MP_DEFINE_CONST_FUN_OBJ_2(str_partition_obj, str_partition);
|
2014-03-19 03:46:14 -04:00
|
|
|
STATIC MP_DEFINE_CONST_FUN_OBJ_2(str_rpartition_obj, str_rpartition);
|
2013-12-21 13:17:45 -05:00
|
|
|
|
2014-03-26 17:47:19 -04:00
|
|
|
STATIC const mp_map_elem_t str_locals_dict_table[] = {
|
|
|
|
{ MP_OBJ_NEW_QSTR(MP_QSTR_find), (mp_obj_t)&str_find_obj },
|
|
|
|
{ MP_OBJ_NEW_QSTR(MP_QSTR_rfind), (mp_obj_t)&str_rfind_obj },
|
|
|
|
{ MP_OBJ_NEW_QSTR(MP_QSTR_join), (mp_obj_t)&str_join_obj },
|
|
|
|
{ MP_OBJ_NEW_QSTR(MP_QSTR_split), (mp_obj_t)&str_split_obj },
|
|
|
|
{ MP_OBJ_NEW_QSTR(MP_QSTR_startswith), (mp_obj_t)&str_startswith_obj },
|
|
|
|
{ MP_OBJ_NEW_QSTR(MP_QSTR_strip), (mp_obj_t)&str_strip_obj },
|
|
|
|
{ MP_OBJ_NEW_QSTR(MP_QSTR_format), (mp_obj_t)&str_format_obj },
|
|
|
|
{ MP_OBJ_NEW_QSTR(MP_QSTR_replace), (mp_obj_t)&str_replace_obj },
|
|
|
|
{ MP_OBJ_NEW_QSTR(MP_QSTR_count), (mp_obj_t)&str_count_obj },
|
|
|
|
{ MP_OBJ_NEW_QSTR(MP_QSTR_partition), (mp_obj_t)&str_partition_obj },
|
|
|
|
{ MP_OBJ_NEW_QSTR(MP_QSTR_rpartition), (mp_obj_t)&str_rpartition_obj },
|
2014-01-06 12:52:29 -05:00
|
|
|
};
|
2014-01-07 10:58:30 -05:00
|
|
|
|
2014-03-26 17:47:19 -04:00
|
|
|
STATIC MP_DEFINE_CONST_DICT(str_locals_dict, str_locals_dict_table);
|
|
|
|
|
2014-03-29 09:43:38 -04:00
|
|
|
const mp_obj_type_t mp_type_str = {
|
2014-02-15 11:10:44 -05:00
|
|
|
{ &mp_type_type },
|
2014-02-15 06:34:50 -05:00
|
|
|
.name = MP_QSTR_str,
|
2014-01-05 15:34:09 -05:00
|
|
|
.print = str_print,
|
2014-03-21 05:39:01 -04:00
|
|
|
.make_new = str_make_new,
|
2014-01-05 15:34:09 -05:00
|
|
|
.binary_op = str_binary_op,
|
2014-01-24 15:50:40 -05:00
|
|
|
.getiter = mp_obj_new_str_iterator,
|
2014-03-09 15:58:18 -04:00
|
|
|
.buffer_p = { .get_buffer = str_get_buffer },
|
2014-03-26 17:47:19 -04:00
|
|
|
.locals_dict = (mp_obj_t)&str_locals_dict,
|
2014-01-24 15:50:40 -05:00
|
|
|
};
|
|
|
|
|
|
|
|
// Reuses most of methods from str
|
2014-03-29 09:43:38 -04:00
|
|
|
const mp_obj_type_t mp_type_bytes = {
|
2014-02-15 11:10:44 -05:00
|
|
|
{ &mp_type_type },
|
2014-02-15 06:34:50 -05:00
|
|
|
.name = MP_QSTR_bytes,
|
2014-01-24 15:50:40 -05:00
|
|
|
.print = str_print,
|
2014-03-21 17:46:59 -04:00
|
|
|
.make_new = bytes_make_new,
|
2014-01-24 15:50:40 -05:00
|
|
|
.binary_op = str_binary_op,
|
|
|
|
.getiter = mp_obj_new_bytes_iterator,
|
2014-03-26 17:47:19 -04:00
|
|
|
.locals_dict = (mp_obj_t)&str_locals_dict,
|
2013-12-21 13:17:45 -05:00
|
|
|
};
|
|
|
|
|
2014-03-21 17:46:59 -04:00
|
|
|
// the zero-length bytes
|
2014-03-29 09:43:38 -04:00
|
|
|
STATIC const mp_obj_str_t empty_bytes_obj = {{&mp_type_bytes}, 0, 0, NULL};
|
2014-03-21 17:46:59 -04:00
|
|
|
const mp_obj_t mp_const_empty_bytes = (mp_obj_t)&empty_bytes_obj;
|
|
|
|
|
2014-01-24 15:50:40 -05:00
|
|
|
mp_obj_t mp_obj_str_builder_start(const mp_obj_type_t *type, uint len, byte **data) {
|
2014-03-20 10:47:44 -04:00
|
|
|
mp_obj_str_t *o = m_new_obj(mp_obj_str_t);
|
2014-01-24 15:50:40 -05:00
|
|
|
o->base.type = type;
|
2014-01-22 09:35:10 -05:00
|
|
|
o->len = len;
|
2014-03-20 10:47:44 -04:00
|
|
|
byte *p = m_new(byte, len + 1);
|
|
|
|
o->data = p;
|
|
|
|
*data = p;
|
2014-01-22 09:35:10 -05:00
|
|
|
return o;
|
|
|
|
}
|
|
|
|
|
|
|
|
mp_obj_t mp_obj_str_builder_end(mp_obj_t o_in) {
|
|
|
|
mp_obj_str_t *o = o_in;
|
|
|
|
o->hash = qstr_compute_hash(o->data, o->len);
|
2014-03-20 10:47:44 -04:00
|
|
|
byte *p = (byte*)o->data;
|
|
|
|
p[o->len] = '\0'; // for now we add null for compatibility with C ASCIIZ strings
|
2013-12-21 13:17:45 -05:00
|
|
|
return o;
|
|
|
|
}
|
|
|
|
|
2014-02-12 11:15:40 -05:00
|
|
|
STATIC mp_obj_t str_new(const mp_obj_type_t *type, const byte* data, uint len) {
|
2014-03-20 10:47:44 -04:00
|
|
|
mp_obj_str_t *o = m_new_obj(mp_obj_str_t);
|
2014-01-24 15:50:40 -05:00
|
|
|
o->base.type = type;
|
|
|
|
o->len = len;
|
2014-03-20 10:47:44 -04:00
|
|
|
if (data) {
|
|
|
|
o->hash = qstr_compute_hash(data, len);
|
|
|
|
byte *p = m_new(byte, len + 1);
|
|
|
|
o->data = p;
|
|
|
|
memcpy(p, data, len * sizeof(byte));
|
|
|
|
p[len] = '\0'; // for now we add null for compatibility with C ASCIIZ strings
|
|
|
|
}
|
2014-01-24 15:50:40 -05:00
|
|
|
return o;
|
|
|
|
}
|
|
|
|
|
2014-01-22 09:35:10 -05:00
|
|
|
mp_obj_t mp_obj_new_str(const byte* data, uint len, bool make_qstr_if_not_already) {
|
|
|
|
qstr q = qstr_find_strn(data, len);
|
|
|
|
if (q != MP_QSTR_NULL) {
|
|
|
|
// qstr with this data already exists
|
|
|
|
return MP_OBJ_NEW_QSTR(q);
|
|
|
|
} else if (make_qstr_if_not_already) {
|
|
|
|
// no existing qstr, make a new one
|
|
|
|
return MP_OBJ_NEW_QSTR(qstr_from_strn((const char*)data, len));
|
|
|
|
} else {
|
|
|
|
// no existing qstr, don't make one
|
2014-03-29 09:43:38 -04:00
|
|
|
return str_new(&mp_type_str, data, len);
|
2014-01-22 09:35:10 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-01-24 15:50:40 -05:00
|
|
|
mp_obj_t mp_obj_new_bytes(const byte* data, uint len) {
|
2014-03-29 09:43:38 -04:00
|
|
|
return str_new(&mp_type_bytes, data, len);
|
2014-01-24 15:50:40 -05:00
|
|
|
}
|
|
|
|
|
2014-01-22 09:35:10 -05:00
|
|
|
bool mp_obj_str_equal(mp_obj_t s1, mp_obj_t s2) {
|
|
|
|
if (MP_OBJ_IS_QSTR(s1) && MP_OBJ_IS_QSTR(s2)) {
|
|
|
|
return s1 == s2;
|
|
|
|
} else {
|
|
|
|
GET_STR_HASH(s1, h1);
|
|
|
|
GET_STR_HASH(s2, h2);
|
|
|
|
if (h1 != h2) {
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
GET_STR_DATA_LEN(s1, d1, l1);
|
|
|
|
GET_STR_DATA_LEN(s2, d2, l2);
|
|
|
|
if (l1 != l2) {
|
|
|
|
return false;
|
|
|
|
}
|
2014-01-23 13:27:51 -05:00
|
|
|
return memcmp(d1, d2, l1) == 0;
|
2014-01-22 09:35:10 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-01-25 08:51:19 -05:00
|
|
|
void bad_implicit_conversion(mp_obj_t self_in) __attribute__((noreturn));
|
|
|
|
void bad_implicit_conversion(mp_obj_t self_in) {
|
2014-04-05 13:32:08 -04:00
|
|
|
nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_TypeError, "Can't convert '%s' object to str implicitly", mp_obj_get_type_str(self_in)));
|
2014-01-25 08:51:19 -05:00
|
|
|
}
|
|
|
|
|
2014-01-22 09:35:10 -05:00
|
|
|
uint mp_obj_str_get_hash(mp_obj_t self_in) {
|
|
|
|
if (MP_OBJ_IS_STR(self_in)) {
|
|
|
|
GET_STR_HASH(self_in, h);
|
|
|
|
return h;
|
|
|
|
} else {
|
2014-01-25 08:51:19 -05:00
|
|
|
bad_implicit_conversion(self_in);
|
2014-01-20 16:33:19 -05:00
|
|
|
}
|
2014-01-22 09:35:10 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
uint mp_obj_str_get_len(mp_obj_t self_in) {
|
|
|
|
if (MP_OBJ_IS_STR(self_in)) {
|
|
|
|
GET_STR_LEN(self_in, l);
|
|
|
|
return l;
|
|
|
|
} else {
|
2014-01-25 08:51:19 -05:00
|
|
|
bad_implicit_conversion(self_in);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// use this if you will anyway convert the string to a qstr
|
|
|
|
// will be more efficient for the case where it's already a qstr
|
|
|
|
qstr mp_obj_str_get_qstr(mp_obj_t self_in) {
|
|
|
|
if (MP_OBJ_IS_QSTR(self_in)) {
|
|
|
|
return MP_OBJ_QSTR_VALUE(self_in);
|
2014-03-29 09:43:38 -04:00
|
|
|
} else if (MP_OBJ_IS_TYPE(self_in, &mp_type_str)) {
|
2014-01-25 08:51:19 -05:00
|
|
|
mp_obj_str_t *self = self_in;
|
|
|
|
return qstr_from_strn((char*)self->data, self->len);
|
|
|
|
} else {
|
|
|
|
bad_implicit_conversion(self_in);
|
2014-01-22 09:35:10 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// only use this function if you need the str data to be zero terminated
|
|
|
|
// at the moment all strings are zero terminated to help with C ASCIIZ compatibility
|
|
|
|
const char *mp_obj_str_get_str(mp_obj_t self_in) {
|
|
|
|
if (MP_OBJ_IS_STR(self_in)) {
|
|
|
|
GET_STR_DATA_LEN(self_in, s, l);
|
|
|
|
(void)l; // len unused
|
|
|
|
return (const char*)s;
|
|
|
|
} else {
|
2014-01-25 08:51:19 -05:00
|
|
|
bad_implicit_conversion(self_in);
|
2014-01-22 09:35:10 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-02-08 13:17:23 -05:00
|
|
|
const char *mp_obj_str_get_data(mp_obj_t self_in, uint *len) {
|
2014-01-22 09:35:10 -05:00
|
|
|
if (MP_OBJ_IS_STR(self_in)) {
|
|
|
|
GET_STR_DATA_LEN(self_in, s, l);
|
|
|
|
*len = l;
|
2014-02-08 13:17:23 -05:00
|
|
|
return (const char*)s;
|
2014-01-22 09:35:10 -05:00
|
|
|
} else {
|
2014-01-25 08:51:19 -05:00
|
|
|
bad_implicit_conversion(self_in);
|
2014-01-20 16:33:19 -05:00
|
|
|
}
|
2013-12-21 13:17:45 -05:00
|
|
|
}
|
2014-01-05 05:47:51 -05:00
|
|
|
|
|
|
|
/******************************************************************************/
|
|
|
|
/* str iterator */
|
|
|
|
|
|
|
|
typedef struct _mp_obj_str_it_t {
|
|
|
|
mp_obj_base_t base;
|
2014-01-22 09:35:10 -05:00
|
|
|
mp_obj_t str;
|
2014-01-05 05:47:51 -05:00
|
|
|
machine_uint_t cur;
|
|
|
|
} mp_obj_str_it_t;
|
|
|
|
|
2014-02-12 11:15:40 -05:00
|
|
|
STATIC mp_obj_t str_it_iternext(mp_obj_t self_in) {
|
2014-01-05 05:47:51 -05:00
|
|
|
mp_obj_str_it_t *self = self_in;
|
2014-01-22 09:35:10 -05:00
|
|
|
GET_STR_DATA_LEN(self->str, str, len);
|
|
|
|
if (self->cur < len) {
|
|
|
|
mp_obj_t o_out = mp_obj_new_str(str + self->cur, 1, true);
|
2014-01-05 05:47:51 -05:00
|
|
|
self->cur += 1;
|
|
|
|
return o_out;
|
|
|
|
} else {
|
2014-03-26 15:27:58 -04:00
|
|
|
return MP_OBJ_NULL;
|
2014-01-05 05:47:51 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-03-29 09:43:38 -04:00
|
|
|
STATIC const mp_obj_type_t mp_type_str_it = {
|
2014-02-15 11:10:44 -05:00
|
|
|
{ &mp_type_type },
|
2014-02-15 06:34:50 -05:00
|
|
|
.name = MP_QSTR_iterator,
|
2014-03-30 15:00:12 -04:00
|
|
|
.getiter = mp_identity,
|
2014-01-05 15:34:09 -05:00
|
|
|
.iternext = str_it_iternext,
|
2014-01-05 05:47:51 -05:00
|
|
|
};
|
|
|
|
|
2014-02-12 11:15:40 -05:00
|
|
|
STATIC mp_obj_t bytes_it_iternext(mp_obj_t self_in) {
|
2014-01-24 15:50:40 -05:00
|
|
|
mp_obj_str_it_t *self = self_in;
|
|
|
|
GET_STR_DATA_LEN(self->str, str, len);
|
|
|
|
if (self->cur < len) {
|
2014-01-24 19:17:36 -05:00
|
|
|
mp_obj_t o_out = MP_OBJ_NEW_SMALL_INT((mp_small_int_t)str[self->cur]);
|
2014-01-24 15:50:40 -05:00
|
|
|
self->cur += 1;
|
|
|
|
return o_out;
|
|
|
|
} else {
|
2014-03-26 15:27:58 -04:00
|
|
|
return MP_OBJ_NULL;
|
2014-01-24 15:50:40 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-03-29 09:43:38 -04:00
|
|
|
STATIC const mp_obj_type_t mp_type_bytes_it = {
|
2014-02-15 11:10:44 -05:00
|
|
|
{ &mp_type_type },
|
2014-02-15 06:34:50 -05:00
|
|
|
.name = MP_QSTR_iterator,
|
2014-03-30 15:00:12 -04:00
|
|
|
.getiter = mp_identity,
|
2014-01-24 15:50:40 -05:00
|
|
|
.iternext = bytes_it_iternext,
|
|
|
|
};
|
|
|
|
|
|
|
|
mp_obj_t mp_obj_new_str_iterator(mp_obj_t str) {
|
2014-01-05 05:47:51 -05:00
|
|
|
mp_obj_str_it_t *o = m_new_obj(mp_obj_str_it_t);
|
2014-03-29 09:43:38 -04:00
|
|
|
o->base.type = &mp_type_str_it;
|
2014-01-05 05:47:51 -05:00
|
|
|
o->str = str;
|
2014-01-24 15:50:40 -05:00
|
|
|
o->cur = 0;
|
|
|
|
return o;
|
|
|
|
}
|
|
|
|
|
|
|
|
mp_obj_t mp_obj_new_bytes_iterator(mp_obj_t str) {
|
|
|
|
mp_obj_str_it_t *o = m_new_obj(mp_obj_str_it_t);
|
2014-03-29 09:43:38 -04:00
|
|
|
o->base.type = &mp_type_bytes_it;
|
2014-01-24 15:50:40 -05:00
|
|
|
o->str = str;
|
|
|
|
o->cur = 0;
|
2014-01-05 05:47:51 -05:00
|
|
|
return o;
|
|
|
|
}
|