Merge pull request #165 from chipaca/builtins

added zip()

py/builtin.c

@@ -324,5 +324,23 @@ static mp_obj_t mp_builtin_sum(int n_args, const mp_obj_t *args) {
     }
     return value;
 }
-
 MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mp_builtin_sum_obj, 1, 2, mp_builtin_sum);
+
+static mp_obj_t mp_builtin_sorted(mp_obj_t args, mp_map_t *kwargs) {
+    mp_obj_t *args_items = NULL;
+    uint args_len = 0;
+
+    assert(MP_OBJ_IS_TYPE(args, &tuple_type));
+    mp_obj_tuple_get(args, &args_len, &args_items);
+    assert(args_len >= 1);
+    if (args_len > 1) {
+        nlr_jump(mp_obj_new_exception_msg(MP_QSTR_TypeError,
+                                          "must use keyword argument for key function"));
+    }
+    mp_obj_t self = list_type.make_new((mp_obj_t)&list_type, 1, args_items);
+    mp_obj_t new_args = rt_build_tuple(1, &self);
+    list_sort(new_args, kwargs);
+
+    return self;
+}
+MP_DEFINE_CONST_FUN_OBJ_KW(mp_builtin_sorted_obj, 1, mp_builtin_sorted);

py/builtin.h

@@ -21,4 +21,5 @@ MP_DECLARE_CONST_FUN_OBJ(mp_builtin_ord_obj);
 MP_DECLARE_CONST_FUN_OBJ(mp_builtin_pow_obj);
 MP_DECLARE_CONST_FUN_OBJ(mp_builtin_print_obj);
 MP_DECLARE_CONST_FUN_OBJ(mp_builtin_range_obj);
+MP_DECLARE_CONST_FUN_OBJ(mp_builtin_sorted_obj);
 MP_DECLARE_CONST_FUN_OBJ(mp_builtin_sum_obj);

py/misc.h

@@ -21,6 +21,7 @@ typedef unsigned int uint;
 #define m_renew(type, ptr, old_num, new_num) ((type*)(m_realloc((ptr), sizeof(type) * (old_num), sizeof(type) * (new_num))))
 #define m_del(type, ptr, num) m_free(ptr, sizeof(type) * (num))
 #define m_del_obj(type, ptr) (m_del(type, ptr, 1))
+#define m_del_var(obj_type, var_type, var_num, ptr) (m_free(ptr, sizeof(obj_type) + sizeof(var_type) * (var_num)))
 
 void *m_malloc(int num_bytes);
 void *m_malloc0(int num_bytes);

py/mpqstrraw.h

@@ -57,9 +57,11 @@ Q(pow)
 Q(print)
 Q(range)
 Q(set)
+Q(sorted)
 Q(sum)
 Q(tuple)
 Q(type)
+Q(zip)
 
 Q(append)
 Q(pop)

py/obj.h

@@ -59,7 +59,7 @@ typedef struct _mp_obj_base_t mp_obj_base_t;
 #define MP_DEFINE_CONST_FUN_OBJ_3(obj_name, fun_name) MP_DEFINE_CONST_FUN_OBJ_VOID_PTR(obj_name, false, 3, 3, (mp_fun_3_t)fun_name)
 #define MP_DEFINE_CONST_FUN_OBJ_VAR(obj_name, n_args_min, fun_name) MP_DEFINE_CONST_FUN_OBJ_VOID_PTR(obj_name, false, n_args_min, (~((machine_uint_t)0)), (mp_fun_var_t)fun_name)
 #define MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(obj_name, n_args_min, n_args_max, fun_name) MP_DEFINE_CONST_FUN_OBJ_VOID_PTR(obj_name, false, n_args_min, n_args_max, (mp_fun_var_t)fun_name)
-#define MP_DEFINE_CONST_FUN_OBJ_KW(obj_name, fun_name) MP_DEFINE_CONST_FUN_OBJ_VOID_PTR(obj_name, true, 0, (~((machine_uint_t)0)), (mp_fun_kw_t)fun_name)
+#define MP_DEFINE_CONST_FUN_OBJ_KW(obj_name, n_args_min, fun_name) MP_DEFINE_CONST_FUN_OBJ_VOID_PTR(obj_name, true, n_args_min, (~((machine_uint_t)0)), (mp_fun_kw_t)fun_name)
 
 // These macros are used to declare and define constant staticmethond and classmethod objects
 // You can put "static" in front of the definitions to make them local
@@ -285,12 +285,14 @@ mp_obj_t mp_obj_complex_binary_op(int op, mp_float_t lhs_real, mp_float_t lhs_im
 // tuple
 extern const mp_obj_type_t tuple_type;
 void mp_obj_tuple_get(mp_obj_t self_in, uint *len, mp_obj_t **items);
+void mp_obj_tuple_del(mp_obj_t self_in);
 
 // list
 extern const mp_obj_type_t list_type;
 mp_obj_t mp_obj_list_append(mp_obj_t self_in, mp_obj_t arg);
 void mp_obj_list_get(mp_obj_t self_in, uint *len, mp_obj_t **items);
 void mp_obj_list_store(mp_obj_t self_in, mp_obj_t index, mp_obj_t value);
+mp_obj_t list_sort(mp_obj_t args, struct _mp_map_t *kwargs);
 
 // dict
 extern const mp_obj_type_t dict_type;
@@ -306,6 +308,10 @@ void mp_obj_set_store(mp_obj_t self_in, mp_obj_t item);
 extern const mp_obj_type_t slice_type;
 void mp_obj_slice_get(mp_obj_t self_in, machine_int_t *start, machine_int_t *stop, machine_int_t *step);
 
+// zip
+extern const mp_obj_type_t zip_type;
+
+
 // functions
 typedef struct _mp_obj_fun_native_t { // need this so we can define const objects (to go in ROM)
     mp_obj_base_t base;

py/objfun.c

@@ -17,21 +17,44 @@
 
 // mp_obj_fun_native_t defined in obj.h
 
+void check_nargs(mp_obj_fun_native_t *self, int n_args, int n_kw) {
+    if (n_kw && !self->is_kw) {
+        nlr_jump(mp_obj_new_exception_msg(MP_QSTR_TypeError,
+                                          "function does not take keyword arguments"));
+    }
+
+    if (self->n_args_min == self->n_args_max) {
+        if (n_args != self->n_args_min) {
+            nlr_jump(mp_obj_new_exception_msg_2_args(MP_QSTR_TypeError,
+                                                     "function takes %d positional arguments but %d were given",
+                                                     (const char*)(machine_int_t)self->n_args_min,
+                                                     (const char*)(machine_int_t)n_args));
+        }
+    } else {
+        if (n_args < self->n_args_min) {
+            nlr_jump(mp_obj_new_exception_msg_1_arg(MP_QSTR_TypeError,
+                                                    "<fun name>() missing %d required positional arguments: <list of names of params>",
+                                                    (const char*)(machine_int_t)(self->n_args_min - n_args)));
+        } else if (n_args > self->n_args_max) {
+            nlr_jump(mp_obj_new_exception_msg_2_args(MP_QSTR_TypeError,
+                                                     "<fun name> expected at most %d arguments, got %d",
+                                                     (void*)(machine_int_t)self->n_args_max, (void*)(machine_int_t)n_args));
+        }
+    }
+}
+
 mp_obj_t fun_native_call_n_kw(mp_obj_t self_in, int n_args, int n_kw, const mp_obj_t *args);
 // args are in reverse order in the array
 mp_obj_t fun_native_call_n(mp_obj_t self_in, int n_args, const mp_obj_t *args) {
     mp_obj_fun_native_t *self = self_in;
+    // check number of arguments
+    check_nargs(self, n_args, 0);
     if (self->is_kw) {
         return fun_native_call_n_kw(self_in, n_args, 0, args);
     }
     if (self->n_args_min == self->n_args_max) {
         // function requires a fixed number of arguments
 
-        // check number of arguments
-        if (n_args != self->n_args_min) {
-            nlr_jump(mp_obj_new_exception_msg_2_args(MP_QSTR_TypeError, "function takes %d positional arguments but %d were given", (const char*)(machine_int_t)self->n_args_min, (const char*)(machine_int_t)n_args));
-        }
-
         // dispatch function call
         switch (self->n_args_min) {
             case 0:
@@ -54,12 +77,6 @@ mp_obj_t fun_native_call_n(mp_obj_t self_in, int n_args, const mp_obj_t *args) {
     } else {
         // function takes a variable number of arguments
 
-        if (n_args < self->n_args_min) {
-            nlr_jump(mp_obj_new_exception_msg_1_arg(MP_QSTR_TypeError, "<fun name>() missing %d required positional arguments: <list of names of params>", (const char*)(machine_int_t)(self->n_args_min - n_args)));
-        } else if (n_args > self->n_args_max) {
-            nlr_jump(mp_obj_new_exception_msg_2_args(MP_QSTR_TypeError, "<fun name> expected at most %d arguments, got %d", (void*)(machine_int_t)self->n_args_max, (void*)(machine_int_t)n_args));
-        }
-
         // TODO really the args need to be passed in as a Python tuple, as the form f(*[1,2]) can be used to pass var args
         mp_obj_t *args_ordered = m_new(mp_obj_t, n_args);
         for (int i = 0; i < n_args; i++) {
@@ -76,9 +93,7 @@ mp_obj_t fun_native_call_n(mp_obj_t self_in, int n_args, const mp_obj_t *args) {
 mp_obj_t fun_native_call_n_kw(mp_obj_t self_in, int n_args, int n_kw, const mp_obj_t *args) {
     mp_obj_fun_native_t *self = self_in;
 
-    if (!self->is_kw) {
-        nlr_jump(mp_obj_new_exception_msg(MP_QSTR_TypeError, "function does not take keyword arguments"));
-    }
+    check_nargs(self, n_args, n_kw);
 
     mp_obj_t *vargs = mp_obj_new_tuple_reverse(n_args, args + 2*n_kw);
     mp_map_t *kw_args = mp_map_new(n_kw);

py/objlist.c

@@ -248,13 +248,14 @@ static void mp_quicksort(mp_obj_t *head, mp_obj_t *tail, mp_obj_t key_fn, bool r
     }
 }
 
-static mp_obj_t list_sort(mp_obj_t args, mp_map_t *kwargs) {
+mp_obj_t list_sort(mp_obj_t args, mp_map_t *kwargs) {
     mp_obj_t *args_items = NULL;
     uint args_len = 0;
 
     assert(MP_OBJ_IS_TYPE(args, &tuple_type));
     mp_obj_tuple_get(args, &args_len, &args_items);
     assert(args_len >= 1);
+    assert(MP_OBJ_IS_TYPE(args_items[0], &list_type));
     if (args_len > 1) {
         nlr_jump(mp_obj_new_exception_msg(MP_QSTR_TypeError,
                                           "list.sort takes no positional arguments"));
@@ -380,7 +381,7 @@ static MP_DEFINE_CONST_FUN_OBJ_3(list_insert_obj, list_insert);
 static MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(list_pop_obj, 1, 2, list_pop);
 static MP_DEFINE_CONST_FUN_OBJ_2(list_remove_obj, list_remove);
 static MP_DEFINE_CONST_FUN_OBJ_1(list_reverse_obj, list_reverse);
-static MP_DEFINE_CONST_FUN_OBJ_KW(list_sort_obj, list_sort);
+static MP_DEFINE_CONST_FUN_OBJ_KW(list_sort_obj, 0, list_sort);
 
 static const mp_method_t list_type_methods[] = {
     { "append", &list_append_obj },

py/objtuple.c

@@ -111,8 +111,10 @@ mp_obj_t mp_obj_new_tuple(uint n, const mp_obj_t *items) {
     mp_obj_tuple_t *o = m_new_obj_var(mp_obj_tuple_t, mp_obj_t, n);
     o->base.type = &tuple_type;
     o->len = n;
-    for (int i = 0; i < n; i++) {
-        o->items[i] = items[i];
+    if (items) {
+        for (int i = 0; i < n; i++) {
+            o->items[i] = items[i];
+        }
     }
     return o;
 }
@@ -133,8 +135,18 @@ mp_obj_t mp_obj_new_tuple_reverse(uint n, const mp_obj_t *items) {
 void mp_obj_tuple_get(mp_obj_t self_in, uint *len, mp_obj_t **items) {
     assert(MP_OBJ_IS_TYPE(self_in, &tuple_type));
     mp_obj_tuple_t *self = self_in;
-    *len = self->len;
-    *items = &self->items[0];
+    if (len) {
+        *len = self->len;
+    }
+    if (items) {
+        *items = &self->items[0];
+    }
+}
+
+void mp_obj_tuple_del(mp_obj_t self_in) {
+    assert(MP_OBJ_IS_TYPE(self_in, &tuple_type));
+    mp_obj_tuple_t *self = self_in;
+    m_del_var(mp_obj_tuple_t, mp_obj_t, self->len, self);
 }
 
 /******************************************************************************/

py/objzip.c

@@ -0,0 +1,59 @@
+#include <stdlib.h>
+#include <assert.h>
+
+#include "misc.h"
+#include "mpconfig.h"
+#include "obj.h"
+#include "runtime.h"
+
+typedef struct _mp_obj_zip_t {
+    mp_obj_base_t base;
+    int n_iters;
+    mp_obj_t iters[];
+} mp_obj_zip_t;
+
+static mp_obj_t zip_getiter(mp_obj_t self_in) {
+    return self_in;
+}
+
+static mp_obj_t zip_iternext(mp_obj_t self_in);
+
+static mp_obj_t zip_make_new(mp_obj_t type_in, int n_args, const mp_obj_t *args) {
+    /* NOTE: args are backwards */
+    mp_obj_zip_t *o = m_new_obj_var(mp_obj_zip_t, mp_obj_t, n_args);
+    o->base.type = &zip_type;
+    o->n_iters = n_args;
+    for (int i = 0; i < n_args; i++) {
+        o->iters[i] = rt_getiter(args[n_args-i-1]);
+    }
+    return o;
+}
+
+const mp_obj_type_t zip_type = {
+    { &mp_const_type },
+    "zip",
+    .make_new = zip_make_new,
+    .iternext = zip_iternext,
+    .getiter = zip_getiter,
+};
+
+static mp_obj_t zip_iternext(mp_obj_t self_in) {
+    assert(MP_OBJ_IS_TYPE(self_in, &zip_type));
+    mp_obj_zip_t *self = self_in;
+    mp_obj_t *items;
+    if (self->n_iters == 0) {
+        return mp_const_stop_iteration;
+    }
+    mp_obj_t o = mp_obj_new_tuple(self->n_iters, NULL);
+    mp_obj_tuple_get(o, NULL, &items);
+
+    for (int i = 0; i < self->n_iters; i++) {
+        mp_obj_t next = rt_iternext(self->iters[i]);
+        if (next == mp_const_stop_iteration) {
+            mp_obj_tuple_del(o);
+            return mp_const_stop_iteration;
+        }
+        items[i] = next;
+    }
+    return o;
+}

py/py.mk

@@ -97,6 +97,7 @@ PY_O_BASENAME = \
 	vm.o \
 	showbc.o \
 	repl.o \
+	objzip.o \
 
 # prepend the build destination prefix to the py object files
 

py/runtime.c

@@ -113,6 +113,7 @@ void rt_init(void) {
     mp_map_add_qstr(&map_builtins, MP_QSTR_set, (mp_obj_t)&set_type);
     mp_map_add_qstr(&map_builtins, MP_QSTR_tuple, (mp_obj_t)&tuple_type);
     mp_map_add_qstr(&map_builtins, MP_QSTR_type, (mp_obj_t)&mp_const_type);
+    mp_map_add_qstr(&map_builtins, MP_QSTR_zip, (mp_obj_t)&zip_type);
 
     // built-in user functions
     mp_map_add_qstr(&map_builtins, MP_QSTR_abs, (mp_obj_t)&mp_builtin_abs_obj);
@@ -133,6 +134,7 @@ void rt_init(void) {
     mp_map_add_qstr(&map_builtins, MP_QSTR_pow, (mp_obj_t)&mp_builtin_pow_obj);
     mp_map_add_qstr(&map_builtins, MP_QSTR_print, (mp_obj_t)&mp_builtin_print_obj);
     mp_map_add_qstr(&map_builtins, MP_QSTR_range, (mp_obj_t)&mp_builtin_range_obj);
+    mp_map_add_qstr(&map_builtins, MP_QSTR_sorted, (mp_obj_t)&mp_builtin_sorted_obj);
     mp_map_add_qstr(&map_builtins, MP_QSTR_sum, (mp_obj_t)&mp_builtin_sum_obj);
 
     next_unique_code_id = 1; // 0 indicates "no code"

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:

tests/basics/tests/sorted.py

@@ -0,0 +1,2 @@
+print(sorted(set(range(100))))
+print(sorted(set(range(100)), key=lambda x: x + 100*(x % 2)))

tests/basics/tests/zip.py

@@ -0,0 +1,2 @@
+print(list(zip()))
+print(list(zip([1], {2,3})))