Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
TASTE
uPython-mirror
Commits
87051712
Commit
87051712
authored
Mar 23, 2015
by
Paul Sokolovsky
Browse files
objstr: Expose mp_obj_str_split() for reuse in other modules.
parent
4a8556ca
Changes
2
Hide whitespace changes
Inline
Side-by-side
py/objstr.c
View file @
87051712
...
...
@@ -456,7 +456,7 @@ STATIC mp_obj_t str_join(mp_obj_t self_in, mp_obj_t arg) {
#define is_ws(c) ((c) == ' ' || (c) == '\t')
STATIC
mp_obj_t
str_split
(
mp_uint_t
n_args
,
const
mp_obj_t
*
args
)
{
mp_obj_t
mp_obj_
str_split
(
mp_uint_t
n_args
,
const
mp_obj_t
*
args
)
{
const
mp_obj_type_t
*
self_type
=
mp_obj_get_type
(
args
[
0
]);
mp_int_t
splits
=
-
1
;
mp_obj_t
sep
=
mp_const_none
;
...
...
@@ -535,7 +535,7 @@ STATIC mp_obj_t str_rsplit(mp_uint_t n_args, const mp_obj_t *args) {
if
(
n_args
<
3
)
{
// If we don't have split limit, it doesn't matter from which side
// we split.
return
str_split
(
n_args
,
args
);
return
mp_obj_
str_split
(
n_args
,
args
);
}
const
mp_obj_type_t
*
self_type
=
mp_obj_get_type
(
args
[
0
]);
mp_obj_t
sep
=
args
[
1
];
...
...
@@ -1762,7 +1762,7 @@ MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(str_rfind_obj, 2, 4, str_rfind);
MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN
(
str_index_obj
,
2
,
4
,
str_index
);
MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN
(
str_rindex_obj
,
2
,
4
,
str_rindex
);
MP_DEFINE_CONST_FUN_OBJ_2
(
str_join_obj
,
str_join
);
MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN
(
str_split_obj
,
1
,
3
,
str_split
);
MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN
(
str_split_obj
,
1
,
3
,
mp_obj_
str_split
);
MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN
(
str_rsplit_obj
,
1
,
3
,
str_rsplit
);
MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN
(
str_startswith_obj
,
2
,
3
,
str_startswith
);
MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN
(
str_endswith_obj
,
2
,
3
,
str_endswith
);
...
...
py/objstr.h
View file @
87051712
...
...
@@ -57,6 +57,7 @@ typedef struct _mp_obj_str_t {
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
);
void
mp_str_print_json
(
void
(
*
print
)(
void
*
env
,
const
char
*
fmt
,
...),
void
*
env
,
const
byte
*
str_data
,
mp_uint_t
str_len
);
mp_obj_t
mp_obj_str_format
(
mp_uint_t
n_args
,
const
mp_obj_t
*
args
,
mp_map_t
*
kwargs
);
mp_obj_t
mp_obj_str_split
(
mp_uint_t
n_args
,
const
mp_obj_t
*
args
);
mp_obj_t
mp_obj_new_str_of_type
(
const
mp_obj_type_t
*
type
,
const
byte
*
data
,
mp_uint_t
len
);
mp_obj_t
mp_obj_str_binary_op
(
mp_uint_t
op
,
mp_obj_t
lhs_in
,
mp_obj_t
rhs_in
);
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment