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 /ewo_CM | |
parent | 7639a439740dfc3cdda4ae188bf3baf7cc2ff7a3 (diff) |
ad variable grouping logic + cleanup generated code newlines
Diffstat (limited to 'ewo_CM')
-rw-r--r-- | ewo_CM/ewo_CM.go | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/ewo_CM/ewo_CM.go b/ewo_CM/ewo_CM.go index 8d21f503..9d263090 100644 --- a/ewo_CM/ewo_CM.go +++ b/ewo_CM/ewo_CM.go @@ -1,6 +1,7 @@ package ewo_CM import ( + "math" "strconv" "github.com/go-playground/locales" @@ -68,32 +69,23 @@ func (ewo *ewo_CM) RangePluralRule(num1 float64, v1 uint64, num2 float64, v2 uin // avoid allocations; otherwise just cast as string. func (ewo *ewo_CM) 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(ewo.decimal) + len(ewo.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(ewo.decimal) - 1; j >= 0; j-- { - b = append(b, ewo.decimal[j]) - } - + b = append(b, ewo.decimal[0]) inWhole = true continue } if inWhole { - if count == 3 { - for j := len(ewo.group) - 1; j >= 0; j-- { b = append(b, ewo.group[j]) } @@ -107,11 +99,16 @@ func (ewo *ewo_CM) FmtNumber(num float64, v uint64) []byte { b = append(b, s[i]) } + if num < 0 { + for j := len(ewo.minus) - 1; j >= 0; j-- { + b = append(b, ewo.minus[j]) + } + } + // 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 - } |