diff options
Diffstat (limited to 'ml/ml.go')
| -rw-r--r-- | ml/ml.go | 28 |
1 files changed, 14 insertions, 14 deletions
@@ -87,23 +87,19 @@ func (ml *ml) RangePluralRule(num1 float64, v1 uint64, num2 float64, v2 uint64) // avoid allocations; otherwise just cast as string. func (ml *ml) 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(ml.decimal) + len(ml.group)*len(s[:len(s)-int(v)-1])/3 - count := 0 inWhole := v == 0 + inSecondary := false + groupThreshold := 3 b := make([]byte, 0, l) for i := len(s) - 1; i >= 0; i-- { if s[i] == '.' { - - for j := len(ml.decimal) - 1; j >= 0; j-- { - b = append(b, ml.decimal[j]) - } - + b = append(b, ml.decimal[0]) inWhole = true continue @@ -111,13 +107,14 @@ func (ml *ml) FmtNumber(num float64, v uint64) []byte { if inWhole { - if count == 3 { + if count == groupThreshold { + b = append(b, ml.group[0]) + count = 1 - for j := len(ml.group) - 1; j >= 0; j-- { - b = append(b, ml.group[j]) + if !inSecondary { + inSecondary = true + groupThreshold = 2 } - - count = 1 } else { count++ } @@ -126,11 +123,14 @@ func (ml *ml) FmtNumber(num float64, v uint64) []byte { b = append(b, s[i]) } + if num < 0 { + b = append(b, ml.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 - } |