Update mpprint.h

IhorNehrutsa · IhorNehrutsa · commit c62d2faa3160 · 2023-03-09T15:03:39.000+02:00
diff --git a/py/mpprint.h b/py/mpprint.h
@@ -79,6 +79,9 @@ int mp_printf(const mp_print_t *print, const char *fmt, ...);
 int mp_vprintf(const mp_print_t *print, const char *fmt, va_list args);
 #endif
 
+#endif // MICROPY_INCLUDED_PY_MPPRINT_H
+
+#if defined(MP_PRN_LEVEL) && (MP_PRN_LEVEL > 0)
 // Debug messages during code developing with MP_PRN(level, ...) & MP_PRN_LEVEL.
 // An approximate hierarchy of debug levels MP_PRN_LEVEL is:
 #define MP_PRN_SUPPRESS 0 // SUPPRESS all messages. Use it in the release version.
@@ -89,13 +92,17 @@ int mp_vprintf(const mp_print_t *print, const char *fmt, va_list args);
 #define MP_PRN_DEBUG 5 // DEBUG, more detailed information, dig deeper.
 #define MP_PRN_TRACE 6 // TRACE, show a flow of the algorithm, like enter/exit a function.
 // In reality, you may use your own classification of debug levels.
-#if defined(MP_PRN_LEVEL) && (MP_PRN_LEVEL > 0)
+
+#if defined(MP_PRN)
+#undef MP_PRN
+#endif
+
 #define MP_PRN(level, ...) \
     do { \
         if ((0 < level) && (level <= MP_PRN_LEVEL)) { \
-            mp_printf(MP_PYTHON_PRINTER, " %d|| ", level); \
+            mp_printf(MP_PYTHON_PRINTER, " %d || ", level); \
             mp_printf(MP_PYTHON_PRINTER, __VA_ARGS__); \
-            mp_printf(MP_PYTHON_PRINTER, " ||%d %s\n", __LINE__, __FILE__); \
+            mp_printf(MP_PYTHON_PRINTER, " || %d %s\n", __LINE__, __FILE__); \
         } \
     } while (0);
 #else
@@ -119,7 +126,6 @@ void foo() {
     ...
     MP_PRN(6, "Exit foo()")
 }
-
 // It is not a dogma. You may start debugging from level 3.
 #define MP_PRN_LEVEL 3
 // Then add MP_PRN(3, ...) and when gets too much messages then change some messages to the next level MP_PRN(4, ...), or MP_PRN(2, ...) etc.
@@ -135,5 +141,3 @@ void foo() {
 #define DEBUG_printf(...)
 #endif
 #endif
-
-#endif // MICROPY_INCLUDED_PY_MPPRINT_H
