seedlingattempt/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #107721 from YYF233333/ps_include

Browse Source 
Remove dependency of `variant.h` in `print_string.h`
This commit is contained in:
Thaddeus Crews
2025-09-22 08:50:04 -05:00
parent 5e8c2f9a0e 05dae23f18
commit 9b7a723aac
6 changed files with 25 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/string/print_string.cpp
View File

@ -341,6 +341,14 @@ bool is_print_verbose_enabled() {
return OS::get_singleton()->is_stdout_verbose();
}
String stringify_variants(const Variant &p_var) {
return p_var.operator String();
String stringify_variants(const Span<Variant> &p_vars) {
if (p_vars.is_empty()) {
return String();
}
String result = String(p_vars[0]);
for (const Variant &v : Span(p_vars.ptr() + 1, p_vars.size() - 1)) {
result += ' ';
result += v.operator String();
}
return result;
}

31
core/string/print_string.h
View File

@ -30,7 +30,9 @@
#pragma once
#include "core/variant/variant.h"
#include "core/string/ustring.h"
class Variant;
extern void (*_print_func)(String);
@ -45,12 +47,7 @@ struct PrintHandlerList {
PrintHandlerList() {}
};
String stringify_variants(const Variant &p_var);
template <typename... Args>
String stringify_variants(const Variant &p_var, Args... p_args) {
return p_var.operator String() + " " + stringify_variants(p_args...);
}
String stringify_variants(const Span<Variant> &p_vars);
void add_print_handler(PrintHandlerList *p_handler);
void remove_print_handler(const PrintHandlerList *p_handler);
@ -69,20 +66,14 @@ extern bool is_print_verbose_enabled();
} \
}
inline void print_line(const Variant &v) {
__print_line(stringify_variants(v));
}
inline void print_line_rich(const Variant &v) {
__print_line_rich(stringify_variants(v));
template <typename... Args>
void print_line(Args... p_args) {
Variant variants[sizeof...(p_args)] = { p_args... };
__print_line(stringify_variants(Span(variants)));
}
template <typename... Args>
void print_line(const Variant &p_var, Args... p_args) {
__print_line(stringify_variants(p_var, p_args...));
}
template <typename... Args>
void print_line_rich(const Variant &p_var, Args... p_args) {
__print_line_rich(stringify_variants(p_var, p_args...));
void print_line_rich(Args... p_args) {
Variant variants[sizeof...(p_args)] = { p_args... };
__print_line_rich(stringify_variants(Span(variants)));
}