Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
M
micropython
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Analytics
Analytics
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
xpstem
micropython
Commits
20d9bc2d
Commit
20d9bc2d
authored
Apr 07, 2016
by
Tom Sparks
Committed by
Paul Sokolovsky
Apr 08, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
extmod/modure: re_exec() renamed to ure_exec() due to collison in 4.3BSD.
Addresses issue #1972.
parent
05ba2433
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
4 deletions
+4
-4
extmod/modure.c
extmod/modure.c
+4
-4
No files found.
extmod/modure.c
View file @
20d9bc2d
...
@@ -92,7 +92,7 @@ STATIC void re_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t
...
@@ -92,7 +92,7 @@ STATIC void re_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t
mp_printf
(
print
,
"<re %p>"
,
self
);
mp_printf
(
print
,
"<re %p>"
,
self
);
}
}
STATIC
mp_obj_t
re_exec
(
bool
is_anchored
,
uint
n_args
,
const
mp_obj_t
*
args
)
{
STATIC
mp_obj_t
u
re_exec
(
bool
is_anchored
,
uint
n_args
,
const
mp_obj_t
*
args
)
{
(
void
)
n_args
;
(
void
)
n_args
;
mp_obj_re_t
*
self
=
MP_OBJ_TO_PTR
(
args
[
0
]);
mp_obj_re_t
*
self
=
MP_OBJ_TO_PTR
(
args
[
0
]);
Subject
subj
;
Subject
subj
;
...
@@ -116,12 +116,12 @@ STATIC mp_obj_t re_exec(bool is_anchored, uint n_args, const mp_obj_t *args) {
...
@@ -116,12 +116,12 @@ STATIC mp_obj_t re_exec(bool is_anchored, uint n_args, const mp_obj_t *args) {
}
}
STATIC
mp_obj_t
re_match
(
size_t
n_args
,
const
mp_obj_t
*
args
)
{
STATIC
mp_obj_t
re_match
(
size_t
n_args
,
const
mp_obj_t
*
args
)
{
return
re_exec
(
true
,
n_args
,
args
);
return
u
re_exec
(
true
,
n_args
,
args
);
}
}
MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN
(
re_match_obj
,
2
,
4
,
re_match
);
MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN
(
re_match_obj
,
2
,
4
,
re_match
);
STATIC
mp_obj_t
re_search
(
size_t
n_args
,
const
mp_obj_t
*
args
)
{
STATIC
mp_obj_t
re_search
(
size_t
n_args
,
const
mp_obj_t
*
args
)
{
return
re_exec
(
false
,
n_args
,
args
);
return
u
re_exec
(
false
,
n_args
,
args
);
}
}
MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN
(
re_search_obj
,
2
,
4
,
re_search
);
MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN
(
re_search_obj
,
2
,
4
,
re_search
);
...
@@ -211,7 +211,7 @@ STATIC mp_obj_t mod_re_exec(bool is_anchored, uint n_args, const mp_obj_t *args)
...
@@ -211,7 +211,7 @@ STATIC mp_obj_t mod_re_exec(bool is_anchored, uint n_args, const mp_obj_t *args)
mp_obj_t
self
=
mod_re_compile
(
1
,
args
);
mp_obj_t
self
=
mod_re_compile
(
1
,
args
);
const
mp_obj_t
args2
[]
=
{
self
,
args
[
1
]};
const
mp_obj_t
args2
[]
=
{
self
,
args
[
1
]};
mp_obj_t
match
=
re_exec
(
is_anchored
,
2
,
args2
);
mp_obj_t
match
=
u
re_exec
(
is_anchored
,
2
,
args2
);
return
match
;
return
match
;
}
}
...
...
Write
Preview
Markdown
is supported
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