json decode_map encode_map

vlang · Dec 18, 2020 · bc6cb4b · bc6cb4b
1 parent 9c68947
commit bc6cb4b
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/vlib/v/gen/json.v b/vlib/v/gen/json.v
@@ -263,7 +263,8 @@ fn (mut g Gen) decode_map(key_type table.Type, value_type table.Type) string {
 	cJSON_ArrayForEach(jsval, root)
 	{
 		$s
-		map_set(&res, tos2( (byteptr) jsval->string ) , &val );
+		string key = tos2( (byteptr) jsval->string )
+		map_set_1(&res, &key, &val);
 	}
 '
 }
@@ -286,7 +287,7 @@ fn (mut g Gen) encode_map(key_type table.Type, value_type table.Type) string {
 	array_$styp $keys_tmp = map_keys(&val);
 	for (int i = 0; i < ${keys_tmp}.len; ++i) {
 		$key
-		cJSON_AddItemToObject(o, (char*) key.str, $fn_name_v ( *($styp_v*) map_get(val, key, &($styp_v[]) { $zero } ) ) );
+		cJSON_AddItemToObject(o, (char*) key.str, $fn_name_v ( *($styp_v*) map_get_1(&val, &key, &($styp_v[]) { $zero } ) ) );
 	}
 	array_free(&$keys_tmp);
 '