7f9d1d6ab9
Previous to this patch the printing mechanism was a bit of a tangled
mess. This patch attempts to consolidate printing into one interface.
All (non-debug) printing now uses the mp_print* family of functions,
mainly mp_printf. All these functions take an mp_print_t structure as
their first argument, and this structure defines the printing backend
through the "print_strn" function of said structure.
Printing from the uPy core can reach the platform-defined print code via
two paths: either through mp_sys_stdout_obj (defined pert port) in
conjunction with mp_stream_write; or through the mp_plat_print structure
which uses the MP_PLAT_PRINT_STRN macro to define how string are printed
on the platform. The former is only used when MICROPY_PY_IO is defined.
With this new scheme printing is generally more efficient (less layers
to go through, less arguments to pass), and, given an mp_print_t*
structure, one can call mp_print_str for efficiency instead of
mp_printf("%s", ...). Code size is also reduced by around 200 bytes on
Thumb2 archs.
102 lines
2.8 KiB
C
102 lines
2.8 KiB
C
#include <stdint.h>
|
|
#include <stdio.h>
|
|
#include <string.h>
|
|
|
|
#include "py/nlr.h"
|
|
#include "py/compile.h"
|
|
#include "py/runtime.h"
|
|
#include "py/repl.h"
|
|
|
|
void do_str(const char *src) {
|
|
mp_lexer_t *lex = mp_lexer_new_from_str_len(MP_QSTR__lt_stdin_gt_, src, strlen(src), 0);
|
|
if (lex == NULL) {
|
|
return;
|
|
}
|
|
|
|
nlr_buf_t nlr;
|
|
if (nlr_push(&nlr) == 0) {
|
|
qstr source_name = lex->source_name;
|
|
mp_parse_node_t pn = mp_parse(lex, MP_PARSE_SINGLE_INPUT);
|
|
mp_obj_t module_fun = mp_compile(pn, source_name, MP_EMIT_OPT_NONE, true);
|
|
mp_call_function_0(module_fun);
|
|
nlr_pop();
|
|
} else {
|
|
// uncaught exception
|
|
mp_obj_print_exception(&mp_plat_print, (mp_obj_t)nlr.ret_val);
|
|
}
|
|
}
|
|
|
|
int main(int argc, char **argv) {
|
|
mp_init();
|
|
do_str("print('hello world!', list(x+1 for x in range(10)), end='eol\n')");
|
|
mp_deinit();
|
|
return 0;
|
|
}
|
|
|
|
void gc_collect(void) {
|
|
}
|
|
|
|
mp_lexer_t *mp_lexer_new_from_file(const char *filename) {
|
|
return NULL;
|
|
}
|
|
|
|
mp_import_stat_t mp_import_stat(const char *path) {
|
|
return MP_IMPORT_STAT_NO_EXIST;
|
|
}
|
|
|
|
mp_obj_t mp_builtin_open(uint n_args, const mp_obj_t *args, mp_map_t *kwargs) {
|
|
return mp_const_none;
|
|
}
|
|
MP_DEFINE_CONST_FUN_OBJ_KW(mp_builtin_open_obj, 1, mp_builtin_open);
|
|
|
|
void nlr_jump_fail(void *val) {
|
|
}
|
|
|
|
void NORETURN __fatal_error(const char *msg) {
|
|
while (1);
|
|
}
|
|
|
|
#ifndef NDEBUG
|
|
void MP_WEAK __assert_func(const char *file, int line, const char *func, const char *expr) {
|
|
printf("Assertion '%s' failed, at file %s:%d\n", expr, file, line);
|
|
__fatal_error("Assertion failed");
|
|
}
|
|
#endif
|
|
|
|
/*
|
|
int _lseek() {return 0;}
|
|
int _read() {return 0;}
|
|
int _write() {return 0;}
|
|
int _close() {return 0;}
|
|
void _exit(int x) {for(;;){}}
|
|
int _sbrk() {return 0;}
|
|
int _kill() {return 0;}
|
|
int _getpid() {return 0;}
|
|
int _fstat() {return 0;}
|
|
int _isatty() {return 0;}
|
|
*/
|
|
|
|
void *malloc(size_t n) {return NULL;}
|
|
void *calloc(size_t nmemb, size_t size) {return NULL;}
|
|
void *realloc(void *ptr, size_t size) {return NULL;}
|
|
void free(void *p) {}
|
|
int printf(const char *m, ...) {return 0;}
|
|
void *memcpy(void *dest, const void *src, size_t n) {return NULL;}
|
|
int memcmp(const void *s1, const void *s2, size_t n) {return 0;}
|
|
void *memmove(void *dest, const void *src, size_t n) {return NULL;}
|
|
void *memset(void *s, int c, size_t n) {return NULL;}
|
|
int strcmp(const char *s1, const char* s2) {return 0;}
|
|
int strncmp(const char *s1, const char* s2, size_t n) {return 0;}
|
|
size_t strlen(const char *s) {return 0;}
|
|
char *strcat(char *dest, const char *src) {return NULL;}
|
|
char *strchr(const char *dest, int c) {return NULL;}
|
|
#include <stdarg.h>
|
|
int vprintf(const char *format, va_list ap) {return 0;}
|
|
int vsnprintf(char *str, size_t size, const char *format, va_list ap) {return 0;}
|
|
|
|
#undef putchar
|
|
int putchar(int c) {return 0;}
|
|
int puts(const char *s) {return 0;}
|
|
|
|
void _start(void) {main(0, NULL);}
|