Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: solve precision problem when decode bigint in json #399

Merged
merged 1 commit into from
Jan 30, 2023
Merged

fix: solve precision problem when decode bigint in json #399

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 12 additions & 4 deletions stdlib/json/decode.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,12 @@ func (d *decodeState) scanNext() {

// scanWhile processes bytes in d.data[d.off:] until it
// receives a scan code not equal to op.
func (d *decodeState) scanWhile(op int) {
func (d *decodeState) scanWhile(op int) (isFloat bool) {
s, data, i := &d.scan, d.data, d.off
for i < len(data) {
if data[i] == '.' {
isFloat = true
}
newOp := s.step(s, data[i])
i++
if newOp != op {
Expand All @@ -76,6 +79,7 @@ func (d *decodeState) scanWhile(op int) {

d.off = len(data) + 1 // mark processed EOF with len+1
d.opcode = d.scan.eof()
return
}

func (d *decodeState) value() (tengo.Object, error) {
Expand Down Expand Up @@ -185,7 +189,7 @@ func (d *decodeState) object() (tengo.Object, error) {
func (d *decodeState) literal() (tengo.Object, error) {
// All bytes inside literal return scanContinue op code.
start := d.readIndex()
d.scanWhile(scanContinue)
isFloat := d.scanWhile(scanContinue)

item := d.data[start:d.readIndex()]

Expand All @@ -210,8 +214,12 @@ func (d *decodeState) literal() (tengo.Object, error) {
if c != '-' && (c < '0' || c > '9') {
panic(phasePanicMsg)
}
n, _ := strconv.ParseFloat(string(item), 10)
return &tengo.Float{Value: n}, nil
if isFloat {
n, _ := strconv.ParseFloat(string(item), 10)
return &tengo.Float{Value: n}, nil
}
n, _ := strconv.ParseInt(string(item), 10, 64)
return &tengo.Int{Value: n}, nil
}
}

Expand Down
2 changes: 2 additions & 0 deletions stdlib/json/json_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,8 @@ func TestJSON(t *testing.T) {
"arr": ARR{1, 2, 3, "four"}})
testJSONEncodeDecode(t, MAP{"a": 0, "b": "bee",
"arr": ARR{1, 2, 3, MAP{"a": false, "b": 109.4}}})

testJSONEncodeDecode(t, MAP{"id1": 7075984636689534001, "id2": 7075984636689534002})
}

func TestDecode(t *testing.T) {
Expand Down
8 changes: 4 additions & 4 deletions stdlib/json_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,21 +48,21 @@ func TestJSON(t *testing.T) {
expect([]byte("[[\"bar\",1],[\"bar\",1]]"))

module(t, "json").call("decode", `5`).
expect(5.0)
expect(5)
module(t, "json").call("decode", `"foo"`).
expect("foo")
module(t, "json").call("decode", `[1,2,3,"bar"]`).
expect(ARR{1.0, 2.0, 3.0, "bar"})
expect(ARR{1, 2, 3, "bar"})
module(t, "json").call("decode", `{"foo":5}`).
expect(MAP{"foo": 5.0})
expect(MAP{"foo": 5})
module(t, "json").call("decode", `{"foo":2.5}`).
expect(MAP{"foo": 2.5})
module(t, "json").call("decode", `{"foo":true}`).
expect(MAP{"foo": true})
module(t, "json").call("decode", `{"foo":"bar"}`).
expect(MAP{"foo": "bar"})
module(t, "json").call("decode", `{"foo":[1,2,3,"bar"]}`).
expect(MAP{"foo": ARR{1.0, 2.0, 3.0, "bar"}})
expect(MAP{"foo": ARR{1, 2, 3, "bar"}})

module(t, "json").
call("indent", []byte("{\"foo\":[\"bar\",1,1.8,56,true]}"), "", " ").
Expand Down