commit 7a16fadbf843ca5d49fb20b5f5785ffccfd9019f
author ian-v <ianv888@gmail.com> Mon Jan 06 09:52:29 2014 -0800
committer ian-v <ianv888@gmail.com> Mon Jan 06 09:52:29 2014 -0800
tree 167d326efc1a1a75d3a371bbeab1a0bc4164fd9e
parent e03c0533fe467439bae1addd6d2a2ee57a9370e4

Co-exist with C++ (issue #85)

py/objlist.c

diff --git a/py/objlist.c b/py/objlist.c
index 02a6b15..3e5a15f 100644
--- a/py/objlist.c
+++ b/py/objlist.c
@@ -260,6 +260,18 @@
 static MP_DEFINE_CONST_FUN_OBJ_1(list_reverse_obj, list_reverse);
 static MP_DEFINE_CONST_FUN_OBJ_2(list_sort_obj, list_sort);
 
+const mp_method_t list_type_methods[] = {
+    { "append", &list_append_obj },
+    { "clear", &list_clear_obj },
+    { "copy", &list_copy_obj },
+    { "count", &list_count_obj },
+    { "index", &list_index_obj },
+    { "pop", &list_pop_obj },
+    { "remove", &list_remove_obj },
+    { "reverse", &list_reverse_obj },
+    { "sort", &list_sort_obj },
+    { NULL, NULL }, // end-of-list sentinel
+};
 const mp_obj_type_t list_type = {
     { &mp_const_type },
     "list",
@@ -268,19 +280,7 @@
     .unary_op = NULL,
     .binary_op = list_binary_op,
     .getiter = list_getiter,
-    .methods = {
-        { "append", &list_append_obj },
-        { "clear", &list_clear_obj },
-        { "copy", &list_copy_obj },
-        { "count", &list_count_obj },
-        { "index", &list_index_obj },
-        { "insert", &list_insert_obj },
-        { "pop", &list_pop_obj },
-        { "remove", &list_remove_obj },
-        { "reverse", &list_reverse_obj },
-        { "sort", &list_sort_obj },
-        { NULL, NULL }, // end-of-list sentinel
-    },
+    .methods = list_type_methods,
 };
 
 static mp_obj_list_t *list_new(uint n) {
@@ -344,7 +344,7 @@
     { &mp_const_type },
     "list_iterator",
     .iternext = list_it_iternext,
-    .methods = { { NULL, NULL }, },
+    .methods = NULL,
 };
 
 mp_obj_t mp_obj_new_list_iterator(mp_obj_list_t *list, int cur) {