mirrors/Odin
1
0
Fork 0
mirror of https://github.com/odin-lang/Odin.git synced 2026-04-21 13:55:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3576 from korvahkh/json-marshal-no-nil

Browse Source 
encoding/json: Properly marshal `#no_nil` unions
This commit is contained in:
gingerBill
2024-05-11 21:50:26 +01:00
committed by GitHub
parent 3a3ae6d0df 9b759f39fc
commit 321e4c45b0
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
core/encoding/json/marshal.odin
View File

@@ -469,12 +469,15 @@ marshal_to_writer :: proc(w: io.Writer, v: any, opt: ^Marshal_Options) -> (err:
case: panic("Invalid union tag type")
}
if v.data == nil || tag == 0 {
io.write_string(w, "null") or_return
} else {
id := info.variants[tag-1].id
return marshal_to_writer(w, any{v.data, id}, opt)
if !info.no_nil {
if tag == 0 {
io.write_string(w, "null") or_return
return nil
}
tag -= 1
}
id := info.variants[tag].id
return marshal_to_writer(w, any{v.data, id}, opt)
case runtime.Type_Info_Enum:
if !opt.use_enum_names || len(info.names) == 0 {