diff options
| author | A1029384756 <hayden.gray104@gmail.com> | 2025-10-07 23:29:10 -0400 |
|---|---|---|
| committer | A1029384756 <hayden.gray104@gmail.com> | 2025-10-07 23:29:10 -0400 |
| commit | 067fbfb48c2673ba4cf9c4b163fc99082d195147 (patch) | |
| tree | 94e6d181e27100d08a4411aa6899c6eabe559355 /core/encoding | |
| parent | cfe651e8d23cb85097db32662acefd27b4350be9 (diff) | |
| parent | 5320feb6737c4d89ce54fda463ea8ff8b8200dba (diff) | |
Merge remote-tracking branch 'upstream/master' into llvm-14-fixes
Diffstat (limited to 'core/encoding')
| -rw-r--r-- | core/encoding/json/marshal.odin | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/core/encoding/json/marshal.odin b/core/encoding/json/marshal.odin index cdb00a354..e563c326a 100644 --- a/core/encoding/json/marshal.odin +++ b/core/encoding/json/marshal.odin @@ -176,7 +176,11 @@ marshal_to_writer :: proc(w: io.Writer, v: any, opt: ^Marshal_Options) -> (err: return .Unsupported_Type case runtime.Type_Info_Pointer: - return .Unsupported_Type + if v.id == typeid_of(Null) { + io.write_string(w, "null") or_return + } else { + return .Unsupported_Type + } case runtime.Type_Info_Multi_Pointer: return .Unsupported_Type |