diff options
author | joeybloggs <Dean.Karn@gmail.com> | 2016-08-13 05:03:24 +0300 |
---|---|---|
committer | joeybloggs <Dean.Karn@gmail.com> | 2016-08-13 05:03:24 +0300 |
commit | 99657750cc781e41c9c1e3be6b6316c18fc430bd (patch) | |
tree | 3366a7d2a645600dbe8efbadc86874f94c1cedb5 /dz/dz.go | |
parent | 7639a439740dfc3cdda4ae188bf3baf7cc2ff7a3 (diff) |
ad variable grouping logic + cleanup generated code newlines
Diffstat (limited to 'dz/dz.go')
-rw-r--r-- | dz/dz.go | 29 |
1 files changed, 15 insertions, 14 deletions
@@ -1,6 +1,7 @@ package dz import ( + "math" "strconv" "github.com/go-playground/locales" @@ -68,23 +69,19 @@ func (dz *dz) RangePluralRule(num1 float64, v1 uint64, num2 float64, v2 uint64) // avoid allocations; otherwise just cast as string. func (dz *dz) 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(dz.decimal) + len(dz.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(dz.decimal) - 1; j >= 0; j-- { - b = append(b, dz.decimal[j]) - } - + b = append(b, dz.decimal[0]) inWhole = true continue @@ -92,13 +89,14 @@ func (dz *dz) FmtNumber(num float64, v uint64) []byte { if inWhole { - if count == 3 { + if count == groupThreshold { + b = append(b, dz.group[0]) + count = 1 - for j := len(dz.group) - 1; j >= 0; j-- { - b = append(b, dz.group[j]) + if !inSecondary { + inSecondary = true + groupThreshold = 2 } - - count = 1 } else { count++ } @@ -107,11 +105,14 @@ func (dz *dz) FmtNumber(num float64, v uint64) []byte { b = append(b, s[i]) } + if num < 0 { + b = append(b, dz.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 - } |