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

cgen: fix json decode with optional argument (fix #13943) (#13958)

Browse Source
This commit is contained in:
yuyi
2022-04-07 00:34:22 +08:00
committed by GitHub
parent 56e6fd01c5
commit c9dcdf6744
3 changed files with 38 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1180,10 +1180,11 @@ fn (mut g Gen) fn_call(node ast.CallExpr) {
is_json_encode := name == 'json.encode'
is_json_encode_pretty := name == 'json.encode_pretty'
is_json_decode := name == 'json.decode'
g.is_json_fn = is_json_encode || is_json_encode_pretty || is_json_decode
is_json_fn := is_json_encode || is_json_encode_pretty || is_json_decode
mut json_type_str := ''
mut json_obj := ''
if g.is_json_fn {
if is_json_fn {
g.is_json_fn = true
json_obj = g.new_tmp_var()
mut tmp2 := ''
cur_line := g.go_before_stmt(0)
@@ -1218,7 +1219,6 @@ fn (mut g Gen) fn_call(node ast.CallExpr) {
// its name was already used to generate the function call
g.is_js_call = true
g.call_args(node)
g.is_js_call = false
g.writeln(');')
tmp2 = g.new_tmp_var()
g.writeln('Option_$typ $tmp2 = $fn_name ($json_obj);')
@@ -1383,7 +1383,7 @@ fn (mut g Gen) fn_call(node ast.CallExpr) {
}
mut tmp_cnt_save := -1
g.write('(')
if g.is_json_fn {
if is_json_fn {
g.write(json_obj)
} else {
if node.is_keep_alive
@@ -1546,6 +1546,7 @@ fn (mut g Gen) call_args(node ast.CallExpr) {
if node.args.len < 1 {
g.error('node should have at least 1 arg', node.pos)
}
g.is_js_call = false
node.args[1..]
} else {
node.args