TheCloud/v
1
0
Fork 0
mirror of https://github.com/vlang/v.git synced 2025-09-10 07:47:20 -04:00
Code Issues Packages Projects Releases Wiki Activity

x.json2.decoder2: support nesteded maps (#23027)

Browse Source
This commit is contained in:
Hitalo Souza 2024-12-01 08:08:37 -04:00 committed by GitHub
parent e421cb2bc2
commit d8021bd459
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
vlib/x/json2/decoder2/decode.v
View File

@ -322,7 +322,7 @@ fn (mut checker Decoder) check_json_format(val string) ! {
} }
} }
} }
if checker.checker_idx < checker_end - 1 { if checker.checker_idx < checker_end - 2 {
checker.checker_idx++ checker.checker_idx++
} }
} }
@ -748,9 +748,12 @@ fn (mut decoder Decoder) decode_map[K, V](mut val map[K]V) ! {
mut map_value := V{} mut map_value := V{}
decoder.decode_value(mut map_value)! $if V is $map {
val[key] = map_value.move()
val[key] = map_value } $else {
val[key] = map_value
}
decoder.decode_value(mut val[key])!
} }
} }
} }

16
vlib/x/json2/decoder2/tests/decode_object_test.v
View File

@ -39,14 +39,16 @@ fn test_array_of_strings() {
assert json.decode[map[string]string]('{"val": "2"}')! == { assert json.decode[map[string]string]('{"val": "2"}')! == {
'val': '2' 'val': '2'
} }
// assert json.decode[map[string]int]('{"val": 2}')! == {"val": 2} assert json.decode[map[string]int]('{"val": 2}')! == {
'val': 2
}
// // nested map // nested map
// assert json.decode[map[string]map[string]string]('{"val": {"val2": "2"}}')! == { assert json.decode[map[string]map[string]string]('{"val": {"val2": "2"}}')! == {
// 'val': { 'val': {
// 'val2': '2' 'val2': '2'
// } }
// } }
// nested struct // nested struct
assert json.decode[Stru]('{"val": 1, "val2": "lala", "val3": {"a": 2, "brazilian_steak": "leleu"}}')! == Stru{ assert json.decode[Stru]('{"val": 1, "val2": "lala", "val3": {"a": 2, "brazilian_steak": "leleu"}}')! == Stru{