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 /ast_ES | |
parent | 7639a439740dfc3cdda4ae188bf3baf7cc2ff7a3 (diff) |
ad variable grouping logic + cleanup generated code newlines
Diffstat (limited to 'ast_ES')
-rw-r--r-- | ast_ES/ast_ES.go | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/ast_ES/ast_ES.go b/ast_ES/ast_ES.go index e3aad2f1..0bf9f582 100644 --- a/ast_ES/ast_ES.go +++ b/ast_ES/ast_ES.go @@ -77,19 +77,15 @@ func (ast *ast_ES) RangePluralRule(num1 float64, v1 uint64, num2 float64, v2 uin // avoid allocations; otherwise just cast as string. func (ast *ast_ES) 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(ast.decimal) + len(ast.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(ast.decimal) - 1; j >= 0; j-- { b = append(b, ast.decimal[j]) } @@ -100,9 +96,7 @@ func (ast *ast_ES) FmtNumber(num float64, v uint64) []byte { } if inWhole { - if count == 3 { - for j := len(ast.group) - 1; j >= 0; j-- { b = append(b, ast.group[j]) } @@ -116,11 +110,16 @@ func (ast *ast_ES) FmtNumber(num float64, v uint64) []byte { b = append(b, s[i]) } + if num < 0 { + for j := len(ast.minus) - 1; j >= 0; j-- { + b = append(b, ast.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 - } |