diff options
Diffstat (limited to 'sw_CD/sw_CD.go')
-rw-r--r-- | sw_CD/sw_CD.go | 23 |
1 files changed, 7 insertions, 16 deletions
diff --git a/sw_CD/sw_CD.go b/sw_CD/sw_CD.go index acf6f847..e65f1a73 100644 --- a/sw_CD/sw_CD.go +++ b/sw_CD/sw_CD.go @@ -88,36 +88,24 @@ func (sw *sw_CD) RangePluralRule(num1 float64, v1 uint64, num2 float64, v2 uint6 // avoid allocations; otherwise just cast as string. func (sw *sw_CD) FmtNumber(num float64, v uint64) []byte { - s := strconv.FormatFloat(num, 'f', int(v), 64) - + s := strconv.FormatFloat(math.Abs(num), 'f', int(v), 64) l := len(s) + len(sw.decimal) + len(sw.group)*len(s[:len(s)-int(v)-1])/3 - count := 0 inWhole := v == 0 - b := make([]byte, 0, l) for i := len(s) - 1; i >= 0; i-- { if s[i] == '.' { - - for j := len(sw.decimal) - 1; j >= 0; j-- { - b = append(b, sw.decimal[j]) - } - + b = append(b, sw.decimal[0]) inWhole = true continue } if inWhole { - if count == 3 { - - for j := len(sw.group) - 1; j >= 0; j-- { - b = append(b, sw.group[j]) - } - + b = append(b, sw.group[0]) count = 1 } else { count++ @@ -127,11 +115,14 @@ func (sw *sw_CD) FmtNumber(num float64, v uint64) []byte { b = append(b, s[i]) } + if num < 0 { + b = append(b, sw.minus[0]) + } + // reverse for i, j := 0, len(b)-1; i < j; i, j = i+1, j-1 { b[i], b[j] = b[j], b[i] } return b - } |