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

Merge pull request #1572 from Lperlind/better-fmt

Browse Source 
Improve core:fmt formatting
This commit is contained in:
gingerBill
2022-03-03 12:07:14 +00:00
committed by GitHub
parent ee28945e09 507722954c
commit 6b2302fa8b
1 changed files with 22 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/fmt/fmt.odin
+22 -6
View File
@@ -605,7 +605,7 @@ fmt_bad_verb :: proc(using fi: ^Info, verb: rune) {
fmt_bool :: proc(using fi: ^Info, b: bool, verb: rune) { fmt_bool :: proc(using fi: ^Info, b: bool, verb: rune) {
switch verb { switch verb {
case 't', 'v': case 't', 'v':
io.write_string(writer, b ? "true" : "false", &fi.n) fmt_string(fi, b ? "true" : "false", 's')
case: case:
fmt_bad_verb(fi, verb) fmt_bad_verb(fi, verb)
} }
@@ -943,11 +943,27 @@ fmt_float :: proc(fi: ^Info, v: f64, bit_size: int, verb: rune) {
fmt_string :: proc(fi: ^Info, s: string, verb: rune) { fmt_string :: proc(fi: ^Info, s: string, verb: rune) {
switch verb { switch verb {
case 's', 'v': case 's', 'v':
io.write_string(fi.writer, s, &fi.n) if fi.width_set {
if fi.width_set && len(s) < fi.width { if fi.width > len(s) {
for _ in 0..<fi.width - len(s) { if fi.minus {
io.write_byte(fi.writer, ' ', &fi.n) io.write_string(fi.writer, s, &fi.n)
}
for _ in 0..<fi.width - len(s) {
io.write_byte(fi.writer, ' ', &fi.n)
}
if !fi.minus {
io.write_string(fi.writer, s, &fi.n)
}
} }
else {
io.write_string(fi.writer, s[:fi.width], &fi.n)
}
}
else
{
io.write_string(fi.writer, s, &fi.n)
} }
case 'q': // quoted string case 'q': // quoted string
@@ -1058,7 +1074,7 @@ fmt_enum :: proc(fi: ^Info, v: any, verb: rune) {
fmt_arg(fi, any{v.data, runtime.type_info_base(e.base).id}, verb) fmt_arg(fi, any{v.data, runtime.type_info_base(e.base).id}, verb)
case 's', 'v': case 's', 'v':
if str, ok := enum_value_to_string(v); ok { if str, ok := enum_value_to_string(v); ok {
io.write_string(fi.writer, str, &fi.n) fmt_string(fi, str, 's')
} else { } else {
io.write_string(fi.writer, "%!(BAD ENUM VALUE=", &fi.n) io.write_string(fi.writer, "%!(BAD ENUM VALUE=", &fi.n)
fmt_arg(fi, any{v.data, runtime.type_info_base(e.base).id}, 'i') fmt_arg(fi, any{v.data, runtime.type_info_base(e.base).id}, 'i')