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

Merge pull request #3756 from matias-eduardo/empty_structs_hash_fmt

Browse Source 
Handle empty structs in hash (#v) fmt
This commit is contained in:
gingerBill
2024-06-16 19:54:28 +01:00
committed by GitHub
parent a66ce4f871 4baf101f15
commit f280ba8511
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/fmt/fmt.odin
+10 -4
View File
@@ -1973,11 +1973,13 @@ fmt_struct :: proc(fi: ^Info, v: any, the_verb: rune, info: runtime.Type_Info_St
// fi.hash = false; // fi.hash = false;
fi.indent += 1 fi.indent += 1
if !is_soa && hash { is_empty := len(info.names) == 0
if !is_soa && hash && !is_empty {
io.write_byte(fi.writer, '\n', &fi.n) io.write_byte(fi.writer, '\n', &fi.n)
} }
defer { defer {
if hash { if !is_soa && hash && !is_empty {
for _ in 0..<indent { io.write_byte(fi.writer, '\t', &fi.n) } for _ in 0..<indent { io.write_byte(fi.writer, '\t', &fi.n) }
} }
io.write_byte(fi.writer, ']' if is_soa && the_verb == 'v' else '}', &fi.n) io.write_byte(fi.writer, ']' if is_soa && the_verb == 'v' else '}', &fi.n)
@@ -2025,9 +2027,9 @@ fmt_struct :: proc(fi: ^Info, v: any, the_verb: rune, info: runtime.Type_Info_St
} }
io.write_string(fi.writer, base_type_name, &fi.n) io.write_string(fi.writer, base_type_name, &fi.n)
io.write_byte(fi.writer, '{', &fi.n) io.write_byte(fi.writer, '{', &fi.n)
if hash { io.write_byte(fi.writer, '\n', &fi.n) } if hash && !is_empty { io.write_byte(fi.writer, '\n', &fi.n) }
defer { defer {
if hash { if hash && !is_empty {
fi.indent -= 1 fi.indent -= 1
fmt_write_indent(fi) fmt_write_indent(fi)
fi.indent += 1 fi.indent += 1
@@ -2075,6 +2077,10 @@ fmt_struct :: proc(fi: ^Info, v: any, the_verb: rune, info: runtime.Type_Info_St
if hash { io.write_string(fi.writer, ",\n", &fi.n) } if hash { io.write_string(fi.writer, ",\n", &fi.n) }
} }
} }
if hash && n > 0 {
for _ in 0..<indent { io.write_byte(fi.writer, '\t', &fi.n) }
}
} else { } else {
field_count := -1 field_count := -1
for name, i in info.names { for name, i in info.names {