Commit c12b2213 authored by Damien George's avatar Damien George
Browse files

Change mp_method_t.name from const char * to qstr.

Addresses issue #377.
parent 69b3ba0d
......@@ -178,8 +178,8 @@ STATIC mp_obj_t mp_builtin_dir(uint n_args, const mp_obj_t *args) {
}
}
if (meth != NULL) {
for (; meth->name != NULL; meth++) {
mp_obj_list_append(dir, MP_OBJ_NEW_QSTR(qstr_from_str(meth->name)));
for (; meth->name != MP_QSTR_NULL; meth++) {
mp_obj_list_append(dir, MP_OBJ_NEW_QSTR(meth->name));
}
}
return dir;
......
......@@ -96,7 +96,7 @@ typedef bool (*mp_store_attr_fun_t)(mp_obj_t self_in, qstr attr, mp_obj_t value)
typedef bool (*mp_store_item_fun_t)(mp_obj_t self_in, mp_obj_t index, mp_obj_t value); // return true if store succeeded
typedef struct _mp_method_t {
const char *name;
qstr name;
mp_const_obj_t fun;
} mp_method_t;
......
......@@ -150,8 +150,8 @@ STATIC machine_int_t array_get_buffer(mp_obj_t o_in, buffer_info_t *bufinfo, int
}
STATIC const mp_method_t array_type_methods[] = {
{ "append", &array_append_obj },
{ NULL, NULL },
{ MP_QSTR_append, &array_append_obj },
{ MP_QSTR_NULL, NULL }, // end-of-list sentinel
};
const mp_obj_type_t mp_type_array = {
......
......@@ -424,18 +424,18 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(dict_values_obj, dict_values);
/* dict constructors & public C API */
STATIC const mp_method_t dict_type_methods[] = {
{ "clear", &dict_clear_obj },
{ "copy", &dict_copy_obj },
{ "fromkeys", &dict_fromkeys_obj },
{ "get", &dict_get_obj },
{ "items", &dict_items_obj },
{ "keys", &dict_keys_obj },
{ "pop", &dict_pop_obj },
{ "popitem", &dict_popitem_obj },
{ "setdefault", &dict_setdefault_obj },
{ "update", &dict_update_obj },
{ "values", &dict_values_obj },
{ NULL, NULL }, // end-of-list sentinel
{ MP_QSTR_clear, &dict_clear_obj },
{ MP_QSTR_copy, &dict_copy_obj },
{ MP_QSTR_fromkeys, &dict_fromkeys_obj },
{ MP_QSTR_get, &dict_get_obj },
{ MP_QSTR_items, &dict_items_obj },
{ MP_QSTR_keys, &dict_keys_obj },
{ MP_QSTR_pop, &dict_pop_obj },
{ MP_QSTR_popitem, &dict_popitem_obj },
{ MP_QSTR_setdefault, &dict_setdefault_obj },
{ MP_QSTR_update, &dict_update_obj },
{ MP_QSTR_values, &dict_values_obj },
{ MP_QSTR_NULL, NULL }, // end-of-list sentinel
};
const mp_obj_type_t dict_type = {
......
......@@ -193,10 +193,10 @@ STATIC mp_obj_t gen_instance_close(mp_obj_t self_in) {
STATIC MP_DEFINE_CONST_FUN_OBJ_1(gen_instance_close_obj, gen_instance_close);
STATIC const mp_method_t gen_type_methods[] = {
{ "close", &gen_instance_close_obj },
{ "send", &gen_instance_send_obj },
{ "throw", &gen_instance_throw_obj },
{ NULL, NULL }, // end-of-list sentinel
{ MP_QSTR_close, &gen_instance_close_obj },
{ MP_QSTR_send, &gen_instance_send_obj },
{ MP_QSTR_throw, &gen_instance_throw_obj },
{ MP_QSTR_NULL, NULL }, // end-of-list sentinel
};
const mp_obj_type_t gen_instance_type = {
......
......@@ -329,18 +329,18 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(list_reverse_obj, list_reverse);
STATIC MP_DEFINE_CONST_FUN_OBJ_KW(list_sort_obj, 0, mp_obj_list_sort);
STATIC const mp_method_t list_type_methods[] = {
{ "append", &list_append_obj },
{ "clear", &list_clear_obj },
{ "copy", &list_copy_obj },
{ "count", &list_count_obj },
{ "extend", &list_extend_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
{ MP_QSTR_append, &list_append_obj },
{ MP_QSTR_clear, &list_clear_obj },
{ MP_QSTR_copy, &list_copy_obj },
{ MP_QSTR_count, &list_count_obj },
{ MP_QSTR_extend, &list_extend_obj },
{ MP_QSTR_index, &list_index_obj },
{ MP_QSTR_insert, &list_insert_obj },
{ MP_QSTR_pop, &list_pop_obj },
{ MP_QSTR_remove, &list_remove_obj },
{ MP_QSTR_reverse, &list_reverse_obj },
{ MP_QSTR_sort, &list_sort_obj },
{ MP_QSTR_NULL, NULL }, // end-of-list sentinel
};
const mp_obj_type_t list_type = {
......
......@@ -424,24 +424,24 @@ STATIC mp_obj_t set_binary_op(int op, mp_obj_t lhs, mp_obj_t rhs) {
STATIC const mp_method_t set_type_methods[] = {
{ "add", &set_add_obj },
{ "clear", &set_clear_obj },
{ "copy", &set_copy_obj },
{ "discard", &set_discard_obj },
{ "difference", &set_diff_obj },
{ "difference_update", &set_diff_update_obj },
{ "intersection", &set_intersect_obj },
{ "intersection_update", &set_intersect_update_obj },
{ "isdisjoint", &set_isdisjoint_obj },
{ "issubset", &set_issubset_obj },
{ "issuperset", &set_issuperset_obj },
{ "pop", &set_pop_obj },
{ "remove", &set_remove_obj },
{ "symmetric_difference", &set_symmetric_difference_obj },
{ "symmetric_difference_update", &set_symmetric_difference_update_obj },
{ "union", &set_union_obj },
{ "update", &set_update_obj },
{ NULL, NULL }, // end-of-list sentinel
{ MP_QSTR_add, &set_add_obj },
{ MP_QSTR_clear, &set_clear_obj },
{ MP_QSTR_copy, &set_copy_obj },
{ MP_QSTR_discard, &set_discard_obj },
{ MP_QSTR_difference, &set_diff_obj },
{ MP_QSTR_difference_update, &set_diff_update_obj },
{ MP_QSTR_intersection, &set_intersect_obj },
{ MP_QSTR_intersection_update, &set_intersect_update_obj },
{ MP_QSTR_isdisjoint, &set_isdisjoint_obj },
{ MP_QSTR_issubset, &set_issubset_obj },
{ MP_QSTR_issuperset, &set_issuperset_obj },
{ MP_QSTR_pop, &set_pop_obj },
{ MP_QSTR_remove, &set_remove_obj },
{ MP_QSTR_symmetric_difference, &set_symmetric_difference_obj },
{ MP_QSTR_symmetric_difference_update, &set_symmetric_difference_update_obj },
{ MP_QSTR_union, &set_union_obj },
{ MP_QSTR_update, &set_update_obj },
{ MP_QSTR_NULL, NULL }, // end-of-list sentinel
};
const mp_obj_type_t set_type = {
......
......@@ -694,18 +694,18 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(str_partition_obj, str_partition);
STATIC MP_DEFINE_CONST_FUN_OBJ_2(str_rpartition_obj, str_rpartition);
STATIC const mp_method_t str_type_methods[] = {
{ "find", &str_find_obj },
{ "rfind", &str_rfind_obj },
{ "join", &str_join_obj },
{ "split", &str_split_obj },
{ "startswith", &str_startswith_obj },
{ "strip", &str_strip_obj },
{ "format", &str_format_obj },
{ "replace", &str_replace_obj },
{ "count", &str_count_obj },
{ "partition", &str_partition_obj },
{ "rpartition", &str_rpartition_obj },
{ NULL, NULL }, // end-of-list sentinel
{ MP_QSTR_find, &str_find_obj },
{ MP_QSTR_rfind, &str_rfind_obj },
{ MP_QSTR_join, &str_join_obj },
{ MP_QSTR_split, &str_split_obj },
{ MP_QSTR_startswith, &str_startswith_obj },
{ MP_QSTR_strip, &str_strip_obj },
{ MP_QSTR_format, &str_format_obj },
{ MP_QSTR_replace, &str_replace_obj },
{ MP_QSTR_count, &str_count_obj },
{ MP_QSTR_partition, &str_partition_obj },
{ MP_QSTR_rpartition, &str_rpartition_obj },
{ MP_QSTR_NULL, NULL }, // end-of-list sentinel
};
const mp_obj_type_t str_type = {
......
......@@ -166,9 +166,9 @@ STATIC mp_obj_t tuple_index(uint n_args, const mp_obj_t *args) {
STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(tuple_index_obj, 2, 4, tuple_index);
STATIC const mp_method_t tuple_type_methods[] = {
{ "count", &tuple_count_obj },
{ "index", &tuple_index_obj },
{ NULL, NULL }, // end-of-list sentinel
{ MP_QSTR_count, &tuple_count_obj },
{ MP_QSTR_index, &tuple_index_obj },
{ MP_QSTR_NULL, NULL }, // end-of-list sentinel
};
const mp_obj_type_t tuple_type = {
......
......@@ -41,8 +41,8 @@ STATIC mp_obj_t mp_obj_class_lookup(const mp_obj_type_t *type, qstr attr) {
} else if (type->methods != NULL) {
// search methods (the const set of methods)
for (const mp_method_t *meth = type->methods; meth->name != NULL; meth++) {
if (strcmp(meth->name, qstr_str(attr)) == 0) {
for (const mp_method_t *meth = type->methods; meth->name != MP_QSTR_NULL; meth++) {
if (meth->name == attr) {
return (mp_obj_t)meth->fun;
}
}
......
......@@ -123,7 +123,26 @@ Q(type)
Q(value)
Q(zip)
Q(clear)
Q(copy)
Q(fromkeys)
Q(get)
Q(items)
Q(keys)
Q(pop)
Q(popitem)
Q(setdefault)
Q(update)
Q(values)
Q(append)
Q(close)
Q(send)
Q(throw)
Q(count)
Q(extend)
Q(index)
Q(remove)
Q(insert)
Q(pop)
Q(sort)
Q(join)
......@@ -131,6 +150,30 @@ Q(strip)
Q(format)
Q(key)
Q(reverse)
Q(add)
Q(clear)
Q(copy)
Q(discard)
Q(difference)
Q(difference_update)
Q(intersection)
Q(intersection_update)
Q(isdisjoint)
Q(issubset)
Q(issuperset)
Q(pop)
Q(remove)
Q(symmetric_difference)
Q(symmetric_difference_update)
Q(union)
Q(update)
Q(find)
Q(rfind)
Q(split)
Q(startswith)
Q(replace)
Q(partition)
Q(rpartition)
Q(bound_method)
Q(closure)
......
......@@ -847,8 +847,8 @@ STATIC void rt_load_method_maybe(mp_obj_t base, qstr attr, mp_obj_t *dest) {
// this is a lookup in the object (ie not class or type)
const mp_method_t *meth = type->methods;
if (meth != NULL) {
for (; meth->name != NULL; meth++) {
if (strcmp(meth->name, qstr_str(attr)) == 0) {
for (; meth->name != MP_QSTR_NULL; meth++) {
if (meth->name == attr) {
// check if the methods are functions, static or class methods
// see http://docs.python.org/3.3/howto/descriptor.html
if (MP_OBJ_IS_TYPE(meth->fun, &mp_type_staticmethod)) {
......
......@@ -324,11 +324,11 @@ static MP_DEFINE_CONST_FUN_OBJ_1(adc_all_read_core_vbat_obj, adc_all_read_core_v
static MP_DEFINE_CONST_FUN_OBJ_1(adc_all_read_core_vref_obj, adc_all_read_core_vref);
static const mp_method_t adc_all_methods[] = {
{ "read_channel", &adc_all_read_channel_obj},
{ "read_core_temp", &adc_all_read_core_temp_obj},
{ "read_core_vbat", &adc_all_read_core_vbat_obj},
{ "read_core_vref", &adc_all_read_core_vref_obj},
{ NULL, NULL },
{ MP_QSTR_read_channel, &adc_all_read_channel_obj},
{ MP_QSTR_read_core_temp, &adc_all_read_core_temp_obj},
{ MP_QSTR_read_core_vbat, &adc_all_read_core_vbat_obj},
{ MP_QSTR_read_core_vref, &adc_all_read_core_vref_obj},
{ MP_QSTR_NULL, NULL },
};
static const mp_obj_type_t adc_all_type = {
......@@ -381,8 +381,8 @@ static mp_obj_t adc_read(mp_obj_t self_in) {
static MP_DEFINE_CONST_FUN_OBJ_1(adc_read_obj, adc_read);
static const mp_method_t adc_methods[] = {
{ "read", &adc_read_obj},
{ NULL, NULL },
{ MP_QSTR_read, &adc_read_obj},
{ MP_QSTR_NULL, NULL },
};
static const mp_obj_type_t adc_type = {
......
......@@ -194,11 +194,11 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(pyb_audio_dac_obj, pyb_audio_dac);
STATIC MP_DEFINE_CONST_FUN_OBJ_KW(pyb_audio_dma_obj, 3, pyb_audio_dma);
STATIC const mp_method_t pyb_audio_methods[] = {
{ "noise", &pyb_audio_noise_obj },
{ "triangle", &pyb_audio_triangle_obj },
{ "dac", &pyb_audio_dac_obj },
{ "dma", &pyb_audio_dma_obj },
{ NULL, NULL },
{ MP_QSTR_noise, &pyb_audio_noise_obj },
{ MP_QSTR_triangle, &pyb_audio_triangle_obj },
{ MP_QSTR_dac, &pyb_audio_dac_obj },
{ MP_QSTR_dma, &pyb_audio_dma_obj },
{ MP_QSTR_NULL, NULL },
};
STATIC const mp_obj_type_t pyb_audio_type = {
......
......@@ -227,11 +227,11 @@ static MP_DEFINE_CONST_FUN_OBJ_1(exti_obj_disable_obj, exti_obj_disable);
static MP_DEFINE_CONST_FUN_OBJ_1(exti_obj_swint_obj, exti_obj_swint);
static const mp_method_t exti_methods[] = {
{ "line", &exti_obj_line_obj },
{ "enable", &exti_obj_enable_obj },
{ "disable", &exti_obj_disable_obj },
{ "swint", &exti_obj_swint_obj },
{ NULL, NULL },
{ MP_QSTR_line, &exti_obj_line_obj },
{ MP_QSTR_enable, &exti_obj_enable_obj },
{ MP_QSTR_disable, &exti_obj_disable_obj },
{ MP_QSTR_swint, &exti_obj_swint_obj },
{ MP_QSTR_NULL, NULL },
};
static mp_obj_t exti_regs(void) {
......
......@@ -53,10 +53,10 @@ static MP_DEFINE_CONST_FUN_OBJ_1(file_obj_close_obj, file_obj_close);
// TODO gc hook to close the file if not already closed
static const mp_method_t file_methods[] = {
{ "read", &file_obj_read_obj },
{ "write", &file_obj_write_obj },
{ "close", &file_obj_close_obj },
{NULL, NULL},
{ MP_QSTR_read, &file_obj_read_obj },
{ MP_QSTR_write, &file_obj_write_obj },
{ MP_QSTR_close, &file_obj_close_obj },
{ MP_QSTR_NULL, NULL },
};
static const mp_obj_type_t file_obj_type = {
......
......@@ -326,12 +326,12 @@ static MP_DEFINE_CONST_FUN_OBJ_1(i2c_obj_readAndStop_obj, i2c_obj_readAndStop);
static MP_DEFINE_CONST_FUN_OBJ_1(i2c_obj_stop_obj, i2c_obj_stop);
static const mp_method_t i2c_methods[] = {
{ "start", &i2c_obj_start_obj },
{ "write", &i2c_obj_write_obj },
{ "read", &i2c_obj_read_obj },
{ "readAndStop", &i2c_obj_readAndStop_obj },
{ "stop", &i2c_obj_stop_obj },
{ NULL, NULL },
{ MP_QSTR_start, &i2c_obj_start_obj },
{ MP_QSTR_write, &i2c_obj_write_obj },
{ MP_QSTR_read, &i2c_obj_read_obj },
{ MP_QSTR_readAndStop, &i2c_obj_readAndStop_obj },
{ MP_QSTR_stop, &i2c_obj_stop_obj },
{ MP_QSTR_NULL, NULL },
};
static const mp_obj_type_t i2c_obj_type = {
......
......@@ -110,10 +110,10 @@ static MP_DEFINE_CONST_FUN_OBJ_1(led_obj_off_obj, led_obj_off);
static MP_DEFINE_CONST_FUN_OBJ_1(led_obj_toggle_obj, led_obj_toggle);
static const mp_method_t led_methods[] = {
{ "on", &led_obj_on_obj },
{ "off", &led_obj_off_obj },
{ "toggle", &led_obj_toggle_obj },
{ NULL, NULL },
{ MP_QSTR_on, &led_obj_on_obj },
{ MP_QSTR_off, &led_obj_off_obj },
{ MP_QSTR_toggle, &led_obj_toggle_obj },
{ MP_QSTR_NULL, NULL },
};
static const mp_obj_type_t led_obj_type = {
......
......@@ -35,10 +35,10 @@ static MP_DEFINE_CONST_FUN_OBJ_1(pin_obj_port_obj, pin_obj_port);
static MP_DEFINE_CONST_FUN_OBJ_1(pin_obj_pin_obj, pin_obj_pin);
static const mp_method_t pin_methods[] = {
{ "name", &pin_obj_name_obj },
{ "port", &pin_obj_port_obj },
{ "pin", &pin_obj_pin_obj },
{ NULL, NULL },
{ MP_QSTR_name, &pin_obj_name_obj },
{ MP_QSTR_port, &pin_obj_port_obj },
{ MP_QSTR_pin, &pin_obj_pin_obj },
{ MP_QSTR_NULL, NULL },
};
const mp_obj_type_t pin_obj_type = {
......
......@@ -55,3 +55,37 @@ Q(PULL_UP)
Q(PULL_DOWN)
Q(PUSH_PULL)
Q(OPEN_DRAIN)
Q(on)
Q(off)
Q(toggle)
Q(line)
Q(enable)
Q(disable)
Q(swint)
Q(read_channel)
Q(read_core_temp)
Q(read_core_vbat)
Q(read_core_vref)
Q(noise)
Q(triangle)
Q(dac)
Q(dma)
Q(present)
Q(power)
Q(read)
Q(read)
Q(write)
Q(close)
Q(name)
Q(port)
Q(pin)
Q(angle)
Q(start)
Q(write)
Q(read)
Q(readAndStop)
Q(stop)
Q(status)
Q(recv_chr)
Q(send_chr)
Q(send)
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment