diff options
| author | Laytan Laats <laytanlaats@hotmail.com> | 2024-04-03 00:05:31 +0200 |
|---|---|---|
| committer | Laytan Laats <laytanlaats@hotmail.com> | 2024-04-03 00:52:58 +0200 |
| commit | 3a0df800664105f5944ad9e0230debe3a3207969 (patch) | |
| tree | f2ac5c150bae1b0fc62bf6381bded50bfad5b6bf /core/encoding/json | |
| parent | 21fcf7c8744260c904e7040bdb1d550a0931aa3e (diff) | |
correct newly found vets
Diffstat (limited to 'core/encoding/json')
| -rw-r--r-- | core/encoding/json/marshal.odin | 21 | ||||
| -rw-r--r-- | core/encoding/json/unmarshal.odin | 4 |
2 files changed, 12 insertions, 13 deletions
diff --git a/core/encoding/json/marshal.odin b/core/encoding/json/marshal.odin index 985de6880..68d087a6e 100644 --- a/core/encoding/json/marshal.odin +++ b/core/encoding/json/marshal.odin @@ -246,7 +246,6 @@ marshal_to_writer :: proc(w: io.Writer, v: any, opt: ^Marshal_Options) -> (err: opt_write_end(w, opt, ']') or_return case runtime.Type_Info_Enumerated_Array: - index := runtime.type_info_base(info.index).variant.(runtime.Type_Info_Enum) opt_write_start(w, opt, '[') or_return for i in 0..<info.count { opt_write_iteration(w, opt, i) or_return @@ -299,14 +298,14 @@ marshal_to_writer :: proc(w: io.Writer, v: any, opt: ^Marshal_Options) -> (err: // check for string type { - v := any{key, info.key.id} - ti := runtime.type_info_base(type_info_of(v.id)) - a := any{v.data, ti.id} + kv := any{key, info.key.id} + kti := runtime.type_info_base(type_info_of(kv.id)) + ka := any{kv.data, kti.id} name: string - #partial switch info in ti.variant { + #partial switch info in kti.variant { case runtime.Type_Info_String: - switch s in a { + switch s in ka { case string: name = s case cstring: name = string(s) } @@ -336,13 +335,13 @@ marshal_to_writer :: proc(w: io.Writer, v: any, opt: ^Marshal_Options) -> (err: // check for string type { - v := any{key, info.key.id} - ti := runtime.type_info_base(type_info_of(v.id)) - a := any{v.data, ti.id} + kv := any{key, info.key.id} + kti := runtime.type_info_base(type_info_of(kv.id)) + ka := any{kv.data, kti.id} - #partial switch info in ti.variant { + #partial switch info in kti.variant { case runtime.Type_Info_String: - switch s in a { + switch s in ka { case string: name = s case cstring: name = string(s) } diff --git a/core/encoding/json/unmarshal.odin b/core/encoding/json/unmarshal.odin index 8c21098fb..edc4903a1 100644 --- a/core/encoding/json/unmarshal.odin +++ b/core/encoding/json/unmarshal.odin @@ -483,9 +483,9 @@ unmarshal_object :: proc(p: ^Parser, v: any, end_token: Token_Kind) -> (err: Unm mem.zero_slice(elem_backing) - if err := unmarshal_value(p, map_backing_value); err != nil { + if uerr := unmarshal_value(p, map_backing_value); uerr != nil { delete(key, p.allocator) - return err + return uerr } key_ptr := rawptr(&key) |