Merge remote-tracking branch 'upstream/master' into duration

goccy · Aug 24, 2021 · 0206999 · 0206999
2 parents f50bfef + e2008a9
commit 0206999
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/encode.go b/encode.go
@@ -390,7 +390,7 @@ func (e *Encoder) encodeFloat(v float64, bitSize int) ast.Node {
 		return ast.Nan(token.New(value, value, e.pos(e.column)))
 	}
 	value := strconv.FormatFloat(v, 'g', -1, bitSize)
-	if !strings.Contains(value, ".") {
+	if !strings.Contains(value, ".") && !strings.Contains(value, "e") {
 		// append x.0 suffix to keep float value context
 		value = fmt.Sprintf("%s.0", value)
 	}

diff --git a/encode_test.go b/encode_test.go
@@ -93,6 +93,11 @@ func TestEncoder(t *testing.T) {
 			map[string]float64{"v": 1.0},
 			nil,
 		},
+		{
+			"v: 1e+06\n",
+			map[string]float64{"v": 1000000},
+			nil,
+		},
 		{
 			"v: .inf\n",
 			map[string]interface{}{"v": math.Inf(0)},