mirrors/Odin
1
0
Fork 0
mirror of https://github.com/odin-lang/Odin.git synced 2026-01-06 04:57:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix %g in fmt, and make %v default to %g for floats

Browse Source
This commit is contained in:
gingerBill
2023-12-21 17:05:24 +00:00
parent 509712f771
commit 55f3e99f63
2 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
core/fmt/fmt.odin
View File

@@ -1232,8 +1232,12 @@ _pad :: proc(fi: ^Info, s: string) {
//
// NOTE: Can return "NaN", "+Inf", "-Inf", "+<value>", or "-<value>".
//
_fmt_float_as :: proc(fi: ^Info, v: f64, bit_size: int, verb: rune, float_fmt: byte) {
prec := fi.prec if fi.prec_set else 3
_fmt_float_as :: proc(fi: ^Info, v: f64, bit_size: int, verb: rune, float_fmt: byte, prec: int) {
prec := prec
if fi.prec_set {
prec = fi.prec
}
buf: [386]byte
// Can return "NaN", "+Inf", "-Inf", "+<value>", "-<value>".
@@ -1242,7 +1246,7 @@ _fmt_float_as :: proc(fi: ^Info, v: f64, bit_size: int, verb: rune, float_fmt: b
if !fi.plus {
// Strip sign from "+<value>" but not "+Inf".
if str[0] == '+' && str[1] != 'I' {
str = str[1:]
str = str[1:]
}
}
@@ -1258,11 +1262,13 @@ _fmt_float_as :: proc(fi: ^Info, v: f64, bit_size: int, verb: rune, float_fmt: b
//
fmt_float :: proc(fi: ^Info, v: f64, bit_size: int, verb: rune) {
switch verb {
case 'f', 'F', 'g', 'G', 'v':
_fmt_float_as(fi, v, bit_size, verb, 'f')
case 'g', 'G', 'v':
_fmt_float_as(fi, v, bit_size, verb, 'g', -1)
case 'f', 'F':
_fmt_float_as(fi, v, bit_size, verb, 'f', 3)
case 'e', 'E':
// BUG(): "%.3e" returns "3.000e+00"
_fmt_float_as(fi, v, bit_size, verb, 'e')
_fmt_float_as(fi, v, bit_size, verb, 'e', 6)
case 'h', 'H':
prev_fi := fi^

9
core/strconv/generic_float.odin
View File

@@ -2,6 +2,8 @@ package strconv
import "decimal"
import "core:runtime"
Decimal_Slice :: struct {
digits: []byte,
count: int,
@@ -103,8 +105,11 @@ generic_ftoa :: proc(buf: []byte, val: f64, fmt: byte, precision, bit_size: int)
}
} else {
switch fmt {
case 'e', 'E': decimal.round(d, prec+1)
case 'f', 'F': decimal.round(d, d.decimal_point+prec)
case 'e', 'E':
prec += 1
decimal.round(d, prec)
case 'f', 'F':
decimal.round(d, d.decimal_point+prec)
case 'g', 'G':
if prec == 0 {
prec = 1