py: Small change to mp_arg_parse_all.

dpgeorge · dpgeorge · commit 64ba6ca1275c · 2014-04-21T00:09:44.000+01:00
diff --git a/py/argcheck.c b/py/argcheck.c
@@ -40,7 +40,7 @@ void mp_arg_parse_all(uint n_pos, const mp_obj_t *pos, mp_map_t *kws, uint n_all
         mp_obj_t given_arg;
         if (i < n_pos) {
             if (allowed[i].flags & MP_ARG_PARSE_KW_ONLY) {
-                nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_TypeError, "'%s' argument must be given by a keyword", qstr_str(allowed[i].qstr)));
+                goto extra_positional;
             }
             pos_found++;
             given_arg = pos[i];
@@ -69,6 +69,7 @@ void mp_arg_parse_all(uint n_pos, const mp_obj_t *pos, mp_map_t *kws, uint n_all
     }
     if (pos_found < n_pos) {
         // TODO better error message
+        extra_positional:
         nlr_raise(mp_obj_new_exception_msg(&mp_type_TypeError, "extra positional arguments given"));
     }
     if (kws_found < kws->used) {

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ void mp_arg_parse_all(uint n_pos, const mp_obj_t pos, mp_map_t kws, uint n_all`
`40`	`40`	`mp_obj_t given_arg;`
`41`	`41`	`if (i < n_pos) {`
`42`	`42`	`if (allowed[i].flags & MP_ARG_PARSE_KW_ONLY) {`
`43`		`- nlr_raise(mp_obj_new_exception_msg_varg(&mp_type_TypeError, "'%s' argument must be given by a keyword", qstr_str(allowed[i].qstr)));`
	`43`	`+ goto extra_positional;`
`44`	`44`	`}`
`45`	`45`	`pos_found++;`
`46`	`46`	`given_arg = pos[i];`
`@@ -69,6 +69,7 @@ void mp_arg_parse_all(uint n_pos, const mp_obj_t pos, mp_map_t kws, uint n_all`
`69`	`69`	`}`
`70`	`70`	`if (pos_found < n_pos) {`
`71`	`71`	`// TODO better error message`
	`72`	`+ extra_positional:`
`72`	`73`	`nlr_raise(mp_obj_new_exception_msg(&mp_type_TypeError, "extra positional arguments given"));`
`73`	`74`	`}`
`74`	`75`	`if (kws_found < kws->used) {`