ed/Odin
1
0
Fork 0
mirror of https://github.com/Ed94/Odin.git synced 2026-08-04 14:48:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4634 from dozn/patch-1

Browse Source 
Use Struct Tags For Embedded (with `using`) Structs When Unmarshalling JSON
This commit is contained in:
gingerBill
2025-01-06 09:33:42 +00:00
committed by GitHub
parent 16acb342d1 87c159c69f
commit c7739de891
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/encoding/json/unmarshal.odin
+2 -2
View File
@@ -439,7 +439,7 @@ unmarshal_object :: proc(p: ^Parser, v: any, end_token: Token_Kind) -> (err: Unm
use_field_idx := -1 use_field_idx := -1
for field, field_idx in fields { for field, field_idx in fields {
tag_value := string(reflect.struct_tag_get(field.tag, "json")) tag_value := reflect.struct_tag_get(field.tag, "json")
json_name, _ := json_name_from_tag_value(tag_value) json_name, _ := json_name_from_tag_value(tag_value)
if key == json_name { if key == json_name {
use_field_idx = field_idx use_field_idx = field_idx
@@ -470,7 +470,7 @@ unmarshal_object :: proc(p: ^Parser, v: any, end_token: Token_Kind) -> (err: Unm
} }
} }
if field.name == key { if field.name == key || (field.tag != "" && reflect.struct_tag_get(field.tag, "json") == key) {
offset = field.offset offset = field.offset
type = field.type type = field.type
found = true found = true