godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-05 12:10:55 +00:00
Code Releases Wiki Activity

Merge pull request #53526 from KoBeWi/super_print

Browse Source
This commit is contained in:
Rémi Verschelde
2021-10-28 15:47:52 +02:00
committed by GitHub
parent 8508f9396d 31012fd060
commit 6b090e325a
3 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/string/print_string.cpp
View File

@@ -69,7 +69,7 @@ void remove_print_handler(PrintHandlerList *p_handler) {
ERR_FAIL_COND(l == nullptr); ERR_FAIL_COND(l == nullptr);
} }
void print_line(String p_string) { void __print_line(String p_string) {
if (!_print_line_enabled) { if (!_print_line_enabled) {
return; return;
} }
@@ -108,3 +108,7 @@ void print_verbose(String p_string) {
print_line(p_string); print_line(p_string);
} }
} }
String stringify_variants(Variant p_var) {
return p_var.operator String();
}

12
core/string/print_string.h
View File

@@ -31,7 +31,7 @@
#ifndef PRINT_STRING_H #ifndef PRINT_STRING_H
#define PRINT_STRING_H #define PRINT_STRING_H
#include "core/string/ustring.h" #include "core/variant/variant.h"
extern void (*_print_func)(String); extern void (*_print_func)(String);
@@ -46,13 +46,21 @@ struct PrintHandlerList {
PrintHandlerList() {} PrintHandlerList() {}
}; };
String stringify_variants(Variant p_var);
template <typename... Args>
String stringify_variants(Variant p_var, Args... p_args) {
return p_var.operator String() + " " + stringify_variants(p_args...);
}
void add_print_handler(PrintHandlerList *p_handler); void add_print_handler(PrintHandlerList *p_handler);
void remove_print_handler(PrintHandlerList *p_handler); void remove_print_handler(PrintHandlerList *p_handler);
extern bool _print_line_enabled; extern bool _print_line_enabled;
extern bool _print_error_enabled; extern bool _print_error_enabled;
extern void print_line(String p_string); extern void __print_line(String p_string);
extern void print_error(String p_string); extern void print_error(String p_string);
extern void print_verbose(String p_string); extern void print_verbose(String p_string);
#define print_line(...) __print_line(stringify_variants(__VA_ARGS__))
#endif // PRINT_STRING_H #endif // PRINT_STRING_H

2
modules/gdscript/gdscript_parser.cpp
View File

@@ -4533,7 +4533,7 @@ void GDScriptParser::TreePrinter::print_tree(const GDScriptParser &p_parser) {
} }
print_class(p_parser.get_tree()); print_class(p_parser.get_tree());
print_line(printed); print_line(String(printed));
} }
#endif // DEBUG_ENABLED #endif // DEBUG_ENABLED