vieter-v
/
v
2
0
Fork 0
Code Issues Pull Requests Releases Activity

cgen: format json encode/decode generated c codes (#13972)

pull/13975/head
yuyi 2022-04-08 22:27:05 +08:00 committed by GitHub
parent 617608b23d
commit 2a88b313d4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
vlib/v/gen/c/fn.v
View File

@ -1206,6 +1206,7 @@ fn (mut g Gen) fn_call(node ast.CallExpr) {
// `json__encode` => `json__encode_User` // `json__encode` => `json__encode_User`
// encode_name := c_name(name) + '_' + util.no_dots(json_type_str) // encode_name := c_name(name) + '_' + util.no_dots(json_type_str)
encode_name := js_enc_name(json_type_str) encode_name := js_enc_name(json_type_str)
g.empty_line = true
g.writeln('// json.encode') g.writeln('// json.encode')
g.write('cJSON* $json_obj = ${encode_name}(') g.write('cJSON* $json_obj = ${encode_name}(')
if node.args[0].typ.is_ptr() { if node.args[0].typ.is_ptr() {
@ -1225,6 +1226,7 @@ fn (mut g Gen) fn_call(node ast.CallExpr) {
typ := c_name(g.typ(ast_type.typ)) typ := c_name(g.typ(ast_type.typ))
fn_name := c_name(name) + '_' + typ fn_name := c_name(name) + '_' + typ
g.gen_json_for_type(ast_type.typ) g.gen_json_for_type(ast_type.typ)
g.empty_line = true
g.writeln('// json.decode') g.writeln('// json.decode')
g.write('cJSON* $json_obj = json__json_parse(') g.write('cJSON* $json_obj = json__json_parse(')
// Skip the first argument in json.decode which is a type // Skip the first argument in json.decode which is a type
@ -1233,10 +1235,10 @@ fn (mut g Gen) fn_call(node ast.CallExpr) {
g.call_args(node) g.call_args(node)
g.writeln(');') g.writeln(');')
tmp2 = g.new_tmp_var() tmp2 = g.new_tmp_var()
g.writeln('Option_$typ $tmp2 = $fn_name ($json_obj);') g.writeln('Option_$typ $tmp2 = ${fn_name}($json_obj);')
} }
if !g.is_autofree { if !g.is_autofree {
g.write('cJSON_Delete($json_obj); //del') g.write('cJSON_Delete($json_obj); // del')
} }
g.write('\n$cur_line') g.write('\n$cur_line')
name = '' name = ''