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

Check for in_bad

Browse Source
This commit is contained in:
gingerBill
2022-06-11 01:17:33 +01:00
parent 7bded4f189
commit 339d6cfd41
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/fmt/fmt.odin
+7 -2
View File
@@ -28,6 +28,7 @@ Info :: struct {
reordered: bool, reordered: bool,
good_arg_index: bool, good_arg_index: bool,
ignore_user_formatters: bool, ignore_user_formatters: bool,
in_bad: bool,
writer: io.Writer, writer: io.Writer,
arg: any, // Temporary arg: any, // Temporary
@@ -591,6 +592,10 @@ int_from_arg :: proc(args: []any, arg_index: int) -> (int, int, bool) {
fmt_bad_verb :: proc(using fi: ^Info, verb: rune) { fmt_bad_verb :: proc(using fi: ^Info, verb: rune) {
prev_in_bad := fi.in_bad
defer fi.in_bad = prev_in_bad
fi.in_bad = true
io.write_string(writer, "%!", &fi.n) io.write_string(writer, "%!", &fi.n)
io.write_rune(writer, verb, &fi.n) io.write_rune(writer, verb, &fi.n)
io.write_byte(writer, '(', &fi.n) io.write_byte(writer, '(', &fi.n)
@@ -947,7 +952,7 @@ fmt_string :: proc(fi: ^Info, s: string, verb: rune) {
if ol, ok := fi.optional_len.?; ok { if ol, ok := fi.optional_len.?; ok {
s = s[:min(len(s), ol)] s = s[:min(len(s), ol)]
} }
if fi.record_level >= 0 && verb == 'v' { if !fi.in_bad && fi.record_level >= 0 && verb == 'v' {
verb = 'q' verb = 'q'
} }
@@ -1271,7 +1276,7 @@ handle_tag :: proc(data: rawptr, info: reflect.Type_Info_Struct, idx: int, verb:
value = value[w:] value = value[w:]
if value == "" || value[0] == ',' { if value == "" || value[0] == ',' {
verb^ = r verb^ = r
if value[0] == ',' { if len(value) > 0 && value[0] == ',' {
switch r { switch r {
case 's', 'q': case 's', 'q':
if optional_len != nil { if optional_len != nil {