mirror/v
1
0
Fork 0
mirror of https://github.com/vlang/v.git synced 2023-08-10 21:13:21 +03:00
Code Issues Projects Releases Wiki Activity

json: fix json.decode with map alias (#17925)

Browse Source
This commit is contained in:
Felipe Pena 2023-04-10 13:50:35 -03:00 committed by GitHub
parent 624f1592a8
commit 319ad5bae2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 36 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
vlib/json/json_alias_test.v Normal file
View File

@ -0,0 +1,26 @@
import json
pub struct User {
name string
age int
height f64
}
type Users = map[string]User
const json_users = '{
"tom": { "name": "Tom", "age": 45, "height": 1.97 },
"martin": { "name": "Martin", "age": 40, "height": 1.8 }
}'
fn test_alias_with_map() {
a := json.decode(map[string]User, json_users)!
b := json.decode(Users, json_users)!
assert Users(a) == b
c := json.encode(a)
d := json.encode(b)
assert c == d
}

14
vlib/v/gen/c/json.v
View File

@ -135,7 +135,7 @@ ${enc_fn_dec} {
m := sym.info as ast.Map m := sym.info as ast.Map
g.gen_json_for_type(m.key_type) g.gen_json_for_type(m.key_type)
g.gen_json_for_type(m.value_type) g.gen_json_for_type(m.value_type)
dec.writeln(g.decode_map(m.key_type, m.value_type)) dec.writeln(g.decode_map(m.key_type, m.value_type, ret_styp))
enc.writeln(g.encode_map(m.key_type, m.value_type)) enc.writeln(g.encode_map(m.key_type, m.value_type))
} else if sym.kind == .alias { } else if sym.kind == .alias {
a := sym.info as ast.Alias a := sym.info as ast.Alias
@ -152,6 +152,12 @@ ${enc_fn_dec} {
g.gen_enum_enc_dec(utyp, psym, mut enc, mut dec) g.gen_enum_enc_dec(utyp, psym, mut enc, mut dec)
} else if psym.kind == .sum_type { } else if psym.kind == .sum_type {
verror('json: ${sym.name} aliased sumtypes does not work at the moment') verror('json: ${sym.name} aliased sumtypes does not work at the moment')
} else if psym.kind == .map {
m := psym.info as ast.Map
g.gen_json_for_type(m.key_type)
g.gen_json_for_type(m.value_type)
dec.writeln(g.decode_map(m.key_type, m.value_type, ret_styp))
enc.writeln(g.encode_map(m.key_type, m.value_type))
} else { } else {
verror('json: ${sym.name} is not struct') verror('json: ${sym.name} is not struct')
} }
@ -867,7 +873,7 @@ fn (mut g Gen) encode_array(utyp ast.Type, value_type ast.Type, fixed_array_size
' '
} }
fn (mut g Gen) decode_map(key_type ast.Type, value_type ast.Type) string { fn (mut g Gen) decode_map(key_type ast.Type, value_type ast.Type, ustyp string) string {
styp := g.typ(key_type) styp := g.typ(key_type)
mut styp_v := g.typ(value_type) mut styp_v := g.typ(value_type)
ret_styp := styp_v.replace('*', '_ptr') ret_styp := styp_v.replace('*', '_ptr')
@ -882,14 +888,14 @@ fn (mut g Gen) decode_map(key_type ast.Type, value_type ast.Type) string {
${result_name}_${ret_styp} val2 = ${fn_name_v} (js_get(root, jsval->string)); ${result_name}_${ret_styp} val2 = ${fn_name_v} (js_get(root, jsval->string));
if(val2.is_error) { if(val2.is_error) {
map_free(&res); map_free(&res);
return *(${result_name}_Map_${styp}_${ret_styp}*)&val2; return *(${result_name}_${ustyp}*)&val2;
} }
${styp_v} val = *(${styp_v}*)val2.data; ${styp_v} val = *(${styp_v}*)val2.data;
' '
} }
return ' return '
if(!cJSON_IsObject(root) && !cJSON_IsNull(root)) { if(!cJSON_IsObject(root) && !cJSON_IsNull(root)) {
return (${result_name}_Map_${styp}_${ret_styp}){ .is_error = true, .err = _v_error(string__plus(_SLIT("Json element is not an object: "), tos2((byteptr)cJSON_PrintUnformatted(root)))), .data = {0}}; return (${result_name}_${ustyp}){ .is_error = true, .err = _v_error(string__plus(_SLIT("Json element is not an object: "), tos2((byteptr)cJSON_PrintUnformatted(root)))), .data = {0}};
} }
res = new_map(sizeof(${styp}), sizeof(${styp_v}), ${hash_fn}, ${key_eq_fn}, ${clone_fn}, ${free_fn}); res = new_map(sizeof(${styp}), sizeof(${styp_v}), ${hash_fn}, ${key_eq_fn}, ${clone_fn}, ${free_fn});
cJSON *jsval = NULL; cJSON *jsval = NULL;