djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add py_get_qstr.

Browse Source
This commit is contained in:
Damien 2013-10-23 00:01:10 +01:00
parent e9f1e50be4
commit 9fc7933ff2
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
py/runtime.c
View File

@ -514,7 +514,7 @@ py_obj_t py_builtin___build_class__(py_obj_t o_class_fun, py_obj_t o_class_name)
} }
py_obj_t py_builtin_range(py_obj_t o_arg) { py_obj_t py_builtin_range(py_obj_t o_arg) {
return py_obj_new_range(0, rt_get_int(o_arg), 1); return py_obj_new_range(0, py_get_int(o_arg), 1);
} }
#ifdef WRITE_NATIVE #ifdef WRITE_NATIVE
@ -845,7 +845,7 @@ int rt_is_true(py_obj_t arg) {
} }
} }
int rt_get_int(py_obj_t arg) { int py_get_int(py_obj_t arg) {
if (arg == py_const_false) { if (arg == py_const_false) {
return 0; return 0;
} else if (arg == py_const_true) { } else if (arg == py_const_true) {
@ -858,6 +858,15 @@ int rt_get_int(py_obj_t arg) {
} }
} }
qstr py_get_qstr(py_obj_t arg) {
if (IS_O(arg, O_STR)) {
return ((py_obj_base_t*)arg)->u_str;
} else {
assert(0);
return 0;
}
}
py_obj_t rt_load_const_str(qstr qstr) { py_obj_t rt_load_const_str(qstr qstr) {
DEBUG_OP_printf("load '%s'\n", qstr_str(qstr)); DEBUG_OP_printf("load '%s'\n", qstr_str(qstr));
return py_obj_new_str(qstr); return py_obj_new_str(qstr);

3
py/runtime.h
View File

@ -97,7 +97,8 @@ void rt_assign_native_code(int unique_code_id, py_fun_t f, uint len, int n_args)
void rt_assign_inline_asm_code(int unique_code_id, py_fun_t f, uint len, int n_args); void rt_assign_inline_asm_code(int unique_code_id, py_fun_t f, uint len, int n_args);
void py_obj_print(py_obj_t o); void py_obj_print(py_obj_t o);
int rt_is_true(py_obj_t arg); int rt_is_true(py_obj_t arg);
int rt_get_int(py_obj_t arg); int py_get_int(py_obj_t arg);
qstr py_get_qstr(py_obj_t arg);
py_obj_t rt_load_const_str(qstr qstr); py_obj_t rt_load_const_str(qstr qstr);
py_obj_t rt_load_name(qstr qstr); py_obj_t rt_load_name(qstr qstr);
py_obj_t rt_load_global(qstr qstr); py_obj_t rt_load_global(qstr qstr);