From 5c7683955994b965270598559e979c581ddc1950 Mon Sep 17 00:00:00 2001
From: "John R. Lenton" <jlenton@gmail.com>
Date: Mon, 13 Jan 2014 05:12:50 +0000
Subject: sorted

---
 py/vm.c | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

(limited to 'py/vm.c')

diff --git a/py/vm.c b/py/vm.c
index baef6988c5..5c74b43caa 100644
--- a/py/vm.c
+++ b/py/vm.c
@@ -440,10 +440,17 @@ bool mp_execute_byte_code_2(const byte **ip_in_out, mp_obj_t *fastn, mp_obj_t **
 
                     case MP_BC_CALL_FUNCTION:
                         DECODE_UINT;
-                        assert((unum & 0xff00) == 0); // n_keyword
-                        unum &= 0xff; // n_positional
-                        sp += unum;
-                        *sp = rt_call_function_n(*sp, unum, sp - unum);
+                        if ((unum & 0xff00) == 0) {
+                            // no keywords
+                            unum &= 0xff; // n_positional
+                            sp += unum;
+                            *sp = rt_call_function_n(*sp, unum, sp - unum);
+                        } else {
+                            // keywords
+                            int argsize = (unum & 0xff) + ((unum >> 7) & 0x1fe);
+                            sp += argsize;
+                            *sp = rt_call_function_n_kw(*sp, unum & 0xff, (unum >> 8) & 0xff, sp - argsize);
+                        }
                         break;
 
                     case MP_BC_CALL_METHOD:
-- 
cgit v1.2.3