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

Clean up trailing comma

Browse Source
This commit is contained in:
gingerBill
2022-06-11 01:23:41 +01:00
parent 1399ecb41c
commit cf0f0c4b31
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/fmt/fmt.odin
+7 -6
View File
@@ -1322,6 +1322,7 @@ fmt_struct :: proc(fi: ^Info, v: any, the_verb: rune, b: runtime.Type_Info_Struc
hash := fi.hash; defer fi.hash = hash hash := fi.hash; defer fi.hash = hash
indent := fi.indent; defer fi.indent -= 1 indent := fi.indent; defer fi.indent -= 1
do_trailing_comma := hash
// fi.hash = false; // fi.hash = false;
fi.indent += 1 fi.indent += 1
@@ -1346,11 +1347,11 @@ fmt_struct :: proc(fi: ^Info, v: any, the_verb: rune, b: runtime.Type_Info_Struc
} }
for index in 0..<uintptr(b.soa_len) { for index in 0..<uintptr(b.soa_len) {
if !hash && index > 0 { io.write_string(fi.writer, ", ", &fi.n) } if !do_trailing_comma && index > 0 { io.write_string(fi.writer, ", ", &fi.n) }
field_count := -1 field_count := -1
if !hash && field_count > 0 { io.write_string(fi.writer, ", ", &fi.n) } if !do_trailing_comma && field_count > 0 { io.write_string(fi.writer, ", ", &fi.n) }
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)
@@ -1360,7 +1361,7 @@ fmt_struct :: proc(fi: ^Info, v: any, the_verb: rune, b: runtime.Type_Info_Struc
verb := 'v' verb := 'v'
field_count += 1 field_count += 1
if !hash && field_count > 0 { io.write_string(fi.writer, ", ", &fi.n) } if !do_trailing_comma && field_count > 0 { io.write_string(fi.writer, ", ", &fi.n) }
if hash { if hash {
fmt_write_indent(fi) fmt_write_indent(fi)
} }
@@ -1377,7 +1378,7 @@ fmt_struct :: proc(fi: ^Info, v: any, the_verb: rune, b: runtime.Type_Info_Struc
fmt_arg(fi, any{data, t.id}, verb) fmt_arg(fi, any{data, t.id}, verb)
} }
if hash { io.write_string(fi.writer, ",\n", &fi.n) } if do_trailing_comma { io.write_string(fi.writer, ",\n", &fi.n) }
} }
} }
} else { } else {
@@ -1397,7 +1398,7 @@ fmt_struct :: proc(fi: ^Info, v: any, the_verb: rune, b: runtime.Type_Info_Struc
fi.optional_len = nil fi.optional_len = nil
} }
if !hash && field_count > 0 { io.write_string(fi.writer, ", ") } if !do_trailing_comma && field_count > 0 { io.write_string(fi.writer, ", ") }
if hash { if hash {
fmt_write_indent(fi) fmt_write_indent(fi)
} }
@@ -1412,7 +1413,7 @@ fmt_struct :: proc(fi: ^Info, v: any, the_verb: rune, b: runtime.Type_Info_Struc
fmt_arg(fi, any{data, t.id}, verb) fmt_arg(fi, any{data, t.id}, verb)
} }
if hash { io.write_string(fi.writer, ",\n", &fi.n) } if do_trailing_comma { io.write_string(fi.writer, ",\n", &fi.n) }
} }
} }
} }