json: fix codegen for struct default expr (fix #23216) (#23233)

This commit is contained in:
Felipe Pena 2024-12-22 19:26:55 -03:00 committed by GitHub
parent 7af8fafc18
commit 98f13ef491
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 42 additions and 1 deletions

View file

@ -0,0 +1,34 @@
import json
pub struct Response {
pub:
results []Result = []Result{len: 0} @[json: list]
tags []string = []string{len: 0} @[json: tags]
kind string @[json: result_type]
}
pub struct Result {
pub:
id int @[json: defid]
author string @[json: author]
definition string @[json: definition]
link string @[json: permalink]
thumbs_down int @[json: thumbs_down]
thumbs_up int @[json: thumbs_up]
word string @[json: word]
date string @[json: written_on]
audio_samples []string @[json: sound_urls]
example string @[json: example]
}
pub fn define(word string) !&Response {
resp := '{"list":[{"defid":3439287}]}'
response := json.decode(Response, resp) or { return err }
return &response
}
fn test_main() {
response := define('')!
assert response.results.len > 0
assert response.results[0].id == 3439287
}

View file

@ -850,7 +850,14 @@ fn (mut g Gen) gen_struct_enc_dec(utyp ast.Type, type_info ast.TypeInfo, styp st
} }
if field.has_default_expr { if field.has_default_expr {
dec.writeln('\t} else {') dec.writeln('\t} else {')
dec.writeln('\t\t${prefix}${op}${c_name(field.name)} = ${g.expr_string(field.default_expr)};') default_str := g.expr_string(field.default_expr)
lines := default_str.count('\n')
if lines > 1 {
dec.writeln(default_str.all_before_last('\n'))
dec.writeln('\t\t${prefix}${op}${c_name(field.name)} = ${default_str.all_after_last('\n')};')
} else {
dec.writeln('\t\t${prefix}${op}${c_name(field.name)} = ${default_str};')
}
} }
dec.writeln('\t}') dec.writeln('\t}')
} }