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

changed to use reflect.enum_name_from_value_any

Browse Source
This commit is contained in:
blob1807
2024-03-01 14:53:39 +10:00
parent f14babe419
commit 41fbaaf1d3
1 changed files with 2 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/encoding/json/marshal.odin
+2 -34
View File
@@ -410,41 +410,9 @@ marshal_to_writer :: proc(w: io.Writer, v: any, opt: ^Marshal_Options) -> (err:
if !opt.use_enum_value_names || len(info.names) == 0 { if !opt.use_enum_value_names || len(info.names) == 0 {
return marshal_to_writer(w, any{v.data, info.base.id}, opt) return marshal_to_writer(w, any{v.data, info.base.id}, opt)
} else { } else {
enum_a := any{v.data, info.base.id} name, found := reflect.enum_name_from_value_any(v)
u: runtime.Type_Info_Enum_Value
switch i in enum_a {
case i8: u = runtime.Type_Info_Enum_Value(i)
case i16: u = runtime.Type_Info_Enum_Value(i)
case i32: u = runtime.Type_Info_Enum_Value(i)
case i64: u = runtime.Type_Info_Enum_Value(i)
case int: u = runtime.Type_Info_Enum_Value(i)
case u8: u = runtime.Type_Info_Enum_Value(i)
case u16: u = runtime.Type_Info_Enum_Value(i)
case u32: u = runtime.Type_Info_Enum_Value(i)
case u64: u = runtime.Type_Info_Enum_Value(i)
case uint: u = runtime.Type_Info_Enum_Value(i)
case uintptr: u = runtime.Type_Info_Enum_Value(i)
case i16le: u = runtime.Type_Info_Enum_Value(i)
case i32le: u = runtime.Type_Info_Enum_Value(i)
case i64le: u = runtime.Type_Info_Enum_Value(i)
case u16le: u = runtime.Type_Info_Enum_Value(i)
case u32le: u = runtime.Type_Info_Enum_Value(i)
case u64le: u = runtime.Type_Info_Enum_Value(i)
case i16be: u = runtime.Type_Info_Enum_Value(i)
case i32be: u = runtime.Type_Info_Enum_Value(i)
case i64be: u = runtime.Type_Info_Enum_Value(i)
case u16be: u = runtime.Type_Info_Enum_Value(i)
case u32be: u = runtime.Type_Info_Enum_Value(i)
case u64be: u = runtime.Type_Info_Enum_Value(i)
case: panic("Invalid enum base type")
}
pos, found := slice.linear_search(info.values, u)
if found { if found {
return marshal_to_writer(w, any(info.names[pos]), opt) return marshal_to_writer(w, name, opt)
} else { } else {
panic("Unable to find value in enum's values") panic("Unable to find value in enum's values")
} }