extmod/modure: Make num_matches store actual number of matches.

dpgeorge · dpgeorge · commit 690458300b40 · 2015-02-18T14:47:14.000Z
diff --git a/extmod/modure.c b/extmod/modure.c
@@ -54,13 +54,13 @@ typedef struct _mp_obj_match_t {
 STATIC void match_print(void (*print)(void *env, const char *fmt, ...), void *env, mp_obj_t self_in, mp_print_kind_t kind) {
     (void)kind;
     mp_obj_match_t *self = self_in;
-    print(env, "<match num=%d @%p>", self->num_matches);
+    print(env, "<match num=%d>", self->num_matches);
 }
 
 STATIC mp_obj_t match_group(mp_obj_t self_in, mp_obj_t no_in) {
     mp_obj_match_t *self = self_in;
     mp_int_t no = mp_obj_int_get_truncated(no_in);
-    if (no < 0 || no >= self->num_matches / 2) {
+    if (no < 0 || no >= self->num_matches) {
         nlr_raise(mp_obj_new_exception_arg1(&mp_type_IndexError, no_in));
     }
 
@@ -104,7 +104,7 @@ STATIC mp_obj_t re_exec(bool is_anchored, uint n_args, const mp_obj_t *args) {
     }
 
     match->base.type = &match_type;
-    match->num_matches = caps_num;
+    match->num_matches = caps_num / 2; // caps_num counts start and end pointers
     match->str = args[1];
     return match;
 }

Original file line number	Diff line number	Diff line change
`@@ -54,13 +54,13 @@ typedef struct _mp_obj_match_t {`
`54`	`54`	`STATIC void match_print(void (print)(void env, const char fmt, ...), void env, mp_obj_t self_in, mp_print_kind_t kind) {`
`55`	`55`	`(void)kind;`
`56`	`56`	`mp_obj_match_t *self = self_in;`
`57`		`- print(env, "<match num=%d @%p>", self->num_matches);`
	`57`	`+ print(env, "<match num=%d>", self->num_matches);`
`58`	`58`	`}`
`59`	`59`
`60`	`60`	`STATIC mp_obj_t match_group(mp_obj_t self_in, mp_obj_t no_in) {`
`61`	`61`	`mp_obj_match_t *self = self_in;`
`62`	`62`	`mp_int_t no = mp_obj_int_get_truncated(no_in);`
`63`		`- if (no < 0 \|\| no >= self->num_matches / 2) {`
	`63`	`+ if (no < 0 \|\| no >= self->num_matches) {`
`64`	`64`	`nlr_raise(mp_obj_new_exception_arg1(&mp_type_IndexError, no_in));`
`65`	`65`	`}`
`66`	`66`
`@@ -104,7 +104,7 @@ STATIC mp_obj_t re_exec(bool is_anchored, uint n_args, const mp_obj_t *args) {`
`104`	`104`	`}`
`105`	`105`
`106`	`106`	`match->base.type = &match_type;`
`107`		`- match->num_matches = caps_num;`
	`107`	`+ match->num_matches = caps_num / 2; // caps_num counts start and end pointers`
`108`	`108`	`match->str = args[1];`
`109`	`109`	`return match;`
`110`	`110`	`}`