StackRduino
diff --git a/‎py/objfun.c‎
Lines changed: 2 additions & 2 deletions b/‎py/objfun.c‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎tests/basics/fun-defargs2.py‎
Lines changed: 6 additions & 0 deletions b/‎tests/basics/fun-defargs2.py‎
Lines changed: 6 additions & 0 deletions
@@ -299,9 +299,9 @@ continue2:;
         // Now fill in defaults
         mp_obj_t *d = &flat_args[self->n_args - 1];
         mp_obj_t *s = &self->extra_args[self->n_def_args - 1];
-        for (int i = self->n_def_args; i > 0; i--) {
+        for (int i = self->n_def_args; i > 0; i--, d--, s--) {
             if (*d == MP_OBJ_NULL) {
-                *d-- = *s--;
+                *d = *s;
             }
         }
         DEBUG_printf("Args after filling defaults: ");
 
@@ -11,3 +11,9 @@ def foo(a, b=3):
 
 # override with keyword
 foo(a=2, b=333)
+
+def foo2(a=1, b=2):
+    print(a, b)
+
+# default and keyword
+foo2(b='two')
Original file line number	Diff line number	Diff line change
`@@ -299,9 +299,9 @@ continue2:;`
`299`	`299`	`// Now fill in defaults`
`300`	`300`	`mp_obj_t *d = &flat_args[self->n_args - 1];`
`301`	`301`	`mp_obj_t *s = &self->extra_args[self->n_def_args - 1];`
`302`		`- for (int i = self->n_def_args; i > 0; i--) {`
	`302`	`+ for (int i = self->n_def_args; i > 0; i--, d--, s--) {`
`303`	`303`	`if (*d == MP_OBJ_NULL) {`
`304`		`- d-- = s--;`
	`304`	`+ d = s;`
`305`	`305`	`}`
`306`	`306`	`}`
`307`	`307`	`DEBUG_printf("Args after filling defaults: ");`