Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ext/json/ext/vendor/fpconv.c
Original file line number Diff line number Diff line change
Expand Up @@ -340,7 +340,7 @@ static int emit_digits(char* digits, int ndigits, char* dest, int K, bool neg)
}

/* write decimal w/o scientific notation */
if(K < 0 && (K > -7 || exp < 4)) {
if(K < 0 && (K > -7 || exp < 10)) {
int offset = ndigits - absv(K);
/* fp < 1.0 -> write leading zero */
if(offset <= 0) {
Expand Down
8 changes: 8 additions & 0 deletions test/json/json_generator_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -771,6 +771,14 @@ def test_json_generate_float
values = [-1.0, 1.0, 0.0, 12.2, 7.5 / 3.2, 12.0, 100.0, 1000.0]
expecteds = ["-1.0", "1.0", "0.0", "12.2", "2.34375", "12.0", "100.0", "1000.0"]

if RUBY_ENGINE == "jruby"
values << 1746861937.7842371
expecteds << "1.7468619377842371E9"
else
values << 1746861937.7842371
expecteds << "1746861937.7842371"
end

values.zip(expecteds).each do |value, expected|
assert_equal expected, value.to_json
end
Expand Down
Loading