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

examples/embedding: Place lexer constructor within NLR handler block. 

The lexer constructor may now raise an exception and it needs to be caught.
This commit is contained in:
Damien George 2017-03-14 11:33:06 +11:00
parent 52f8f5666a
commit 21420b13c0
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
examples/embedding/hello-embed.c
View File

@ -35,9 +35,10 @@
static char heap[16384]; static char heap[16384];
mp_obj_t execute_from_lexer(mp_lexer_t *lex) { mp_obj_t execute_from_str(const char *str) {
nlr_buf_t nlr; nlr_buf_t nlr;
if (nlr_push(&nlr) == 0) { if (nlr_push(&nlr) == 0) {
mp_lexer_t *lex = mp_lexer_new_from_str_len(0/*MP_QSTR_*/, str, strlen(str), false);
mp_parse_tree_t pt = mp_parse(lex, MP_PARSE_FILE_INPUT); mp_parse_tree_t pt = mp_parse(lex, MP_PARSE_FILE_INPUT);
mp_obj_t module_fun = mp_compile(&pt, lex->source_name, MP_EMIT_OPT_NONE, false); mp_obj_t module_fun = mp_compile(&pt, lex->source_name, MP_EMIT_OPT_NONE, false);
mp_call_function_0(module_fun); mp_call_function_0(module_fun);
@ -58,8 +59,7 @@ int main() {
mp_init(); mp_init();
const char str[] = "print('Hello world of easy embedding!')"; const char str[] = "print('Hello world of easy embedding!')";
mp_lexer_t *lex = mp_lexer_new_from_str_len(0/*MP_QSTR_*/, str, strlen(str), false); if (execute_from_str(str)) {
if (execute_from_lexer(lex)) {
printf("Error\n"); printf("Error\n");
} }
} }