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

bare-arm, minimal, qemu-arm: Make do_str() take parse-input-kind as arg.

Browse Source 
The do_str() function is provided essentially as documentation to show
how to compile and execute a string.  This patch makes do_str take an
extra arg to specify how the string should be interpreted: either as a
single line (ie from a REPL) or as multiple lines (ie from a file).
This commit is contained in:
Damien George 2015-06-22 22:38:47 +01:00
parent fe99ea9aab
commit c4b592d379
3 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
bare-arm/main.c
View File

@ -7,7 +7,7 @@
#include "py/runtime.h" #include "py/runtime.h"
#include "py/repl.h" #include "py/repl.h"
void do_str(const char *src) { void do_str(const char *src, mp_parse_input_kind_t input_kind) {
mp_lexer_t *lex = mp_lexer_new_from_str_len(MP_QSTR__lt_stdin_gt_, src, strlen(src), 0); mp_lexer_t *lex = mp_lexer_new_from_str_len(MP_QSTR__lt_stdin_gt_, src, strlen(src), 0);
if (lex == NULL) { if (lex == NULL) {
return; return;
@ -16,7 +16,7 @@ void do_str(const char *src) {
nlr_buf_t nlr; nlr_buf_t nlr;
if (nlr_push(&nlr) == 0) { if (nlr_push(&nlr) == 0) {
qstr source_name = lex->source_name; qstr source_name = lex->source_name;
mp_parse_node_t pn = mp_parse(lex, MP_PARSE_SINGLE_INPUT); mp_parse_node_t pn = mp_parse(lex, input_kind);
mp_obj_t module_fun = mp_compile(pn, source_name, MP_EMIT_OPT_NONE, true); mp_obj_t module_fun = mp_compile(pn, source_name, MP_EMIT_OPT_NONE, true);
mp_call_function_0(module_fun); mp_call_function_0(module_fun);
nlr_pop(); nlr_pop();
@ -28,7 +28,8 @@ void do_str(const char *src) {
int main(int argc, char **argv) { int main(int argc, char **argv) {
mp_init(); mp_init();
do_str("print('hello world!', list(x+1 for x in range(10)), end='eol\n')"); do_str("print('hello world!', list(x+1 for x in range(10)), end='eol\\n')", MP_PARSE_SINGLE_INPUT);
do_str("for i in range(10):\n print(i)", MP_PARSE_FILE_INPUT);
mp_deinit(); mp_deinit();
return 0; return 0;
} }

7
minimal/main.c
View File

@ -9,7 +9,7 @@
#include "py/gc.h" #include "py/gc.h"
#include "pyexec.h" #include "pyexec.h"
void do_str(const char *src) { void do_str(const char *src, mp_parse_input_kind_t input_kind) {
mp_lexer_t *lex = mp_lexer_new_from_str_len(MP_QSTR__lt_stdin_gt_, src, strlen(src), 0); mp_lexer_t *lex = mp_lexer_new_from_str_len(MP_QSTR__lt_stdin_gt_, src, strlen(src), 0);
if (lex == NULL) { if (lex == NULL) {
printf("MemoryError: lexer could not allocate memory\n"); printf("MemoryError: lexer could not allocate memory\n");
@ -19,7 +19,7 @@ void do_str(const char *src) {
nlr_buf_t nlr; nlr_buf_t nlr;
if (nlr_push(&nlr) == 0) { if (nlr_push(&nlr) == 0) {
qstr source_name = lex->source_name; qstr source_name = lex->source_name;
mp_parse_node_t pn = mp_parse(lex, MP_PARSE_SINGLE_INPUT); mp_parse_node_t pn = mp_parse(lex, input_kind);
mp_obj_t module_fun = mp_compile(pn, source_name, MP_EMIT_OPT_NONE, true); mp_obj_t module_fun = mp_compile(pn, source_name, MP_EMIT_OPT_NONE, true);
mp_call_function_0(module_fun); mp_call_function_0(module_fun);
nlr_pop(); nlr_pop();
@ -51,7 +51,8 @@ int main(int argc, char **argv) {
#else #else
pyexec_friendly_repl(); pyexec_friendly_repl();
#endif #endif
//do_str("print('hello world!', list(x+1 for x in range(10)), end='eol\\n')"); //do_str("print('hello world!', list(x+1 for x in range(10)), end='eol\\n')", MP_PARSE_SINGLE_INPUT);
//do_str("for i in range(10):\r\n print(i)", MP_PARSE_FILE_INPUT);
mp_deinit(); mp_deinit();
return 0; return 0;
} }

6
qemu-arm/main.c
View File

@ -12,7 +12,7 @@
#include "py/gc.h" #include "py/gc.h"
#include "py/repl.h" #include "py/repl.h"
void do_str(const char *src) { void do_str(const char *src, mp_parse_input_kind_t input_kind) {
mp_lexer_t *lex = mp_lexer_new_from_str_len(MP_QSTR__lt_stdin_gt_, src, strlen(src), 0); mp_lexer_t *lex = mp_lexer_new_from_str_len(MP_QSTR__lt_stdin_gt_, src, strlen(src), 0);
if (lex == NULL) { if (lex == NULL) {
return; return;
@ -21,7 +21,7 @@ void do_str(const char *src) {
nlr_buf_t nlr; nlr_buf_t nlr;
if (nlr_push(&nlr) == 0) { if (nlr_push(&nlr) == 0) {
qstr source_name = lex->source_name; qstr source_name = lex->source_name;
mp_parse_node_t pn = mp_parse(lex, MP_PARSE_SINGLE_INPUT); mp_parse_node_t pn = mp_parse(lex, input_kind);
mp_obj_t module_fun = mp_compile(pn, source_name, MP_EMIT_OPT_NONE, true); mp_obj_t module_fun = mp_compile(pn, source_name, MP_EMIT_OPT_NONE, true);
mp_call_function_0(module_fun); mp_call_function_0(module_fun);
nlr_pop(); nlr_pop();
@ -36,7 +36,7 @@ int main(int argc, char **argv) {
void *heap = malloc(16 * 1024); void *heap = malloc(16 * 1024);
gc_init(heap, (char*)heap + 16 * 1024); gc_init(heap, (char*)heap + 16 * 1024);
mp_init(); mp_init();
do_str("print('hello world!')"); do_str("print('hello world!')", MP_PARSE_SINGLE_INPUT);
mp_deinit(); mp_deinit();
return 0; return 0;
} }