From 5ae5ec986ea5e14321f6c8091454c165c23b40c5 Mon Sep 17 00:00:00 2001
From: Damien George <damien.p.george@gmail.com>
Date: Sat, 11 Apr 2015 12:01:39 +0100
Subject: [PATCH] py: Make mp_sys_stdout_print object, wrapping sys.stdout for
mp_print*.
So now all printing should go via either mp_plat_print or
mp_sys_stdout_print.
---
py/modbuiltins.c | 5 ++---
py/modsys.c | 4 ++++
py/mpprint.h | 9 ++++++---
py/obj.c | 7 +------
4 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/py/modbuiltins.c b/py/modbuiltins.c
index f080f457b..f001d7057 100644
--- a/py/modbuiltins.c
+++ b/py/modbuiltins.c
@@ -440,9 +440,8 @@ MP_DEFINE_CONST_FUN_OBJ_KW(mp_builtin_print_obj, 0, mp_builtin_print);
STATIC mp_obj_t mp_builtin___repl_print__(mp_obj_t o) {
if (o != mp_const_none) {
#if MICROPY_PY_IO
- mp_print_t print = {&mp_sys_stdout_obj, (mp_print_strn_t)mp_stream_write};
- mp_obj_print_helper(&print, o, PRINT_REPR);
- mp_stream_write(&mp_sys_stdout_obj, "\n", 1);
+ mp_obj_print_helper(&mp_sys_stdout_print, o, PRINT_REPR);
+ mp_print_str(&mp_sys_stdout_print, "\n");
#else
mp_obj_print(o, PRINT_REPR);
printf("\n");
diff --git a/py/modsys.c b/py/modsys.c
index 09e72e98a..537befd07 100644
--- a/py/modsys.c
+++ b/py/modsys.c
@@ -42,6 +42,10 @@ extern struct _mp_dummy_t mp_sys_stdin_obj;
extern struct _mp_dummy_t mp_sys_stdout_obj;
extern struct _mp_dummy_t mp_sys_stderr_obj;
+#if MICROPY_PY_IO
+const mp_print_t mp_sys_stdout_print = {&mp_sys_stdout_obj, (mp_print_strn_t)mp_stream_write};
+#endif
+
/// \constant version - Python language version that this implementation conforms to, as a string
STATIC const MP_DEFINE_STR_OBJ(version_obj, "3.4.0");
diff --git a/py/mpprint.h b/py/mpprint.h
index 60fa18acf..de497ce90 100644
--- a/py/mpprint.h
+++ b/py/mpprint.h
@@ -47,10 +47,13 @@ typedef struct _mp_print_t {
mp_print_strn_t print_strn;
} mp_print_t;
-// Wrapper for platform print function, which wraps MP_PLAT_PRINT_STRN.
-// All (non-debug) prints go through this interface (except some which
-// go through mp_sys_stdout_obj if MICROPY_PY_IO is defined).
+// All (non-debug) prints go through one of the two interfaces below.
+// 1) Wrapper for platform print function, which wraps MP_PLAT_PRINT_STRN.
extern const mp_print_t mp_plat_print;
+#if MICROPY_PY_IO
+// 2) Wrapper for printing to sys.stdout.
+extern const mp_print_t mp_sys_stdout_print;
+#endif
int mp_print_str(const mp_print_t *print, const char *str);
int mp_print_strn(const mp_print_t *print, const char *str, mp_uint_t len, int flags, char fill, int width);
diff --git a/py/obj.c b/py/obj.c
index 0d318fa14..eb9af9ea8 100644
--- a/py/obj.c
+++ b/py/obj.c
@@ -73,12 +73,7 @@ void mp_obj_print_helper(const mp_print_t *print, mp_obj_t o_in, mp_print_kind_t
void mp_obj_print(mp_obj_t o_in, mp_print_kind_t kind) {
#if MICROPY_PY_IO
- // defined per port; type of these is irrelevant, just need pointer
- extern struct _mp_dummy_t mp_sys_stdout_obj;
- mp_print_t print;
- print.data = &mp_sys_stdout_obj;
- print.print_strn = (mp_print_strn_t)mp_stream_write;
- mp_obj_print_helper(&print, o_in, kind);
+ mp_obj_print_helper(&mp_sys_stdout_print, o_in, kind);
#else
mp_obj_print_helper(&mp_plat_print, o_in, kind);
#endif
--
GitLab