From d22cb20d85e0afeb61f6ad26434dd92b9d9b2ff7 Mon Sep 17 00:00:00 2001
From: dozn <16659513+dozn@users.noreply.github.com>
Date: Sat, 28 Dec 2024 07:48:09 -0800
Subject: Use Struct Tags For Embedded (with `using`) Structs When
 Unmarshalling JSON

A fix for https://github.com/odin-lang/Odin/issues/4539
---
 core/encoding/json/unmarshal.odin | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'core/encoding')

diff --git a/core/encoding/json/unmarshal.odin b/core/encoding/json/unmarshal.odin
index c70b8d39a..e76de2747 100644
--- a/core/encoding/json/unmarshal.odin
+++ b/core/encoding/json/unmarshal.odin
@@ -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
 						type = field.type
 						found = true
-- 
cgit v1.2.3


From 87c159c69fd699312fa014700c03f43188dd0728 Mon Sep 17 00:00:00 2001
From: dozn <16659513+dozn@users.noreply.github.com>
Date: Sat, 28 Dec 2024 08:13:38 -0800
Subject: Remove unnecessary string() conversion.

---
 core/encoding/json/unmarshal.odin | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'core/encoding')

diff --git a/core/encoding/json/unmarshal.odin b/core/encoding/json/unmarshal.odin
index e76de2747..57371e360 100644
--- a/core/encoding/json/unmarshal.odin
+++ b/core/encoding/json/unmarshal.odin
@@ -439,7 +439,7 @@ unmarshal_object :: proc(p: ^Parser, v: any, end_token: Token_Kind) -> (err: Unm
 			use_field_idx := -1
 			
 			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)
 				if key == json_name {
 					use_field_idx = field_idx
-- 
cgit v1.2.3