extmod/modure: re_exec() renamed to ure_exec() due to collison in 4.3BSD.

Tom Sparks · pfalcon · commit 20d9bc2d76a4 · 2016-04-08T20:12:03.000+03:00
Addresses issue adafruit#1972.
diff --git a/extmod/modure.c b/extmod/modure.c
@@ -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);
 }
 
-STATIC mp_obj_t re_exec(bool is_anchored, uint n_args, const mp_obj_t *args) {
+STATIC mp_obj_t ure_exec(bool is_anchored, uint n_args, const mp_obj_t *args) {
     (void)n_args;
     mp_obj_re_t *self = MP_OBJ_TO_PTR(args[0]);
     Subject subj;
@@ -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) {
-    return re_exec(true, n_args, args);
+    return ure_exec(true, n_args, args);
 }
 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) {
-    return re_exec(false, n_args, args);
+    return ure_exec(false, n_args, args);
 }
 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)
     mp_obj_t self = mod_re_compile(1, args);
 
     const mp_obj_t args2[] = {self, args[1]};
-    mp_obj_t match = re_exec(is_anchored, 2, args2);
+    mp_obj_t match = ure_exec(is_anchored, 2, args2);
     return match;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,7 @@ STATIC void re_print(const mp_print_t *print, mp_obj_t self_in, mp_print_kind_t`
`92`	`92`	`mp_printf(print, "<re %p>", self);`
`93`	`93`	`}`
`94`	`94`
`95`		`-STATIC mp_obj_t re_exec(bool is_anchored, uint n_args, const mp_obj_t *args) {`
	`95`	`+STATIC mp_obj_t ure_exec(bool is_anchored, uint n_args, const mp_obj_t *args) {`
`96`	`96`	`(void)n_args;`
`97`	`97`	`mp_obj_re_t *self = MP_OBJ_TO_PTR(args[0]);`
`98`	`98`	`Subject subj;`
`@@ -116,12 +116,12 @@ STATIC mp_obj_t re_exec(bool is_anchored, uint n_args, const mp_obj_t *args) {`
`116`	`116`	`}`
`117`	`117`
`118`	`118`	`STATIC mp_obj_t re_match(size_t n_args, const mp_obj_t *args) {`
`119`		`- return re_exec(true, n_args, args);`
	`119`	`+ return ure_exec(true, n_args, args);`
`120`	`120`	`}`
`121`	`121`	`MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(re_match_obj, 2, 4, re_match);`
`122`	`122`
`123`	`123`	`STATIC mp_obj_t re_search(size_t n_args, const mp_obj_t *args) {`
`124`		`- return re_exec(false, n_args, args);`
	`124`	`+ return ure_exec(false, n_args, args);`
`125`	`125`	`}`
`126`	`126`	`MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(re_search_obj, 2, 4, re_search);`
`127`	`127`
`@@ -211,7 +211,7 @@ STATIC mp_obj_t mod_re_exec(bool is_anchored, uint n_args, const mp_obj_t *args)`
`211`	`211`	`mp_obj_t self = mod_re_compile(1, args);`
`212`	`212`
`213`	`213`	`const mp_obj_t args2[] = {self, args[1]};`
`214`		`- mp_obj_t match = re_exec(is_anchored, 2, args2);`
	`214`	`+ mp_obj_t match = ure_exec(is_anchored, 2, args2);`
`215`	`215`	`return match;`
`216`	`216`	`}`
`217`	`217`