ed/Odin
1
0
Fork 0
mirror of https://github.com/Ed94/Odin.git synced 2026-08-05 23:28:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve fmt._user_formatters logic

Browse Source
This commit is contained in:
gingerBill
2021-08-13 12:44:55 +01:00
parent ad402726f1
commit a3930cb470
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/fmt/fmt.odin
+5 -1
View File
@@ -27,6 +27,7 @@ Info :: struct {
reordered: bool, reordered: bool,
good_arg_index: bool, good_arg_index: bool,
ignore_user_formatters: bool,
writer: io.Writer, writer: io.Writer,
arg: any, // Temporary arg: any, // Temporary
@@ -1267,15 +1268,18 @@ fmt_value :: proc(fi: ^Info, v: any, verb: rune) {
return; return;
} }
if _user_formatters != nil { if _user_formatters != nil && !fi.ignore_user_formatters {
formatter := _user_formatters[v.id]; formatter := _user_formatters[v.id];
if formatter != nil { if formatter != nil {
fi.ignore_user_formatters = false;
if ok := formatter(fi, v, verb); !ok { if ok := formatter(fi, v, verb); !ok {
fi.ignore_user_formatters = true;
fmt_bad_verb(fi, verb); fmt_bad_verb(fi, verb);
} }
return; return;
} }
} }
fi.ignore_user_formatters = false;
type_info := type_info_of(v.id); type_info := type_info_of(v.id);
switch info in type_info.variant { switch info in type_info.variant {