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

Clean up json.marshal_to_writer

Browse Source
This commit is contained in:
gingerBill
2021-09-29 14:50:53 +01:00
parent 1d6e398f20
commit aac290e366
1 changed files with 12 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/encoding/json/marshal.odin
+12 -36
View File
@@ -9,7 +9,6 @@ import "core:io"
Marshal_Data_Error :: enum { Marshal_Data_Error :: enum {
Unsupported_Type, Unsupported_Type,
Invalid_Data,
} }
Marshal_Error :: union { Marshal_Error :: union {
@@ -32,11 +31,10 @@ marshal :: proc(v: any, allocator := context.allocator) -> (data: []byte, err: M
} }
marshal_to_builder :: proc(b: ^strings.Builder, v: any) -> Marshal_Error { marshal_to_builder :: proc(b: ^strings.Builder, v: any) -> Marshal_Error {
w := strings.to_writer(b) return marshal_to_writer(strings.to_writer(b), v)
return marshal_to_writer(w, v)
} }
marshal_to_writer :: proc(w: io.Writer, v: any) -> Marshal_Error { marshal_to_writer :: proc(w: io.Writer, v: any) -> (err: Marshal_Error) {
write_f64 :: proc(w: io.Writer, val: f64, size: int) -> io.Error { write_f64 :: proc(w: io.Writer, val: f64, size: int) -> io.Error {
buf: [386]byte buf: [386]byte
@@ -53,12 +51,10 @@ marshal_to_writer :: proc(w: io.Writer, v: any) -> Marshal_Error {
_ = io.write_string(w, string(s)) or_return _ = io.write_string(w, string(s)) or_return
return nil return nil
} }
if v == nil { if v == nil {
io.write_string(w, "null") or_return io.write_string(w, "null") or_return
return .None return
} }
ti := runtime.type_info_base(type_info_of(v.id)) ti := runtime.type_info_base(type_info_of(v.id))
@@ -195,35 +191,15 @@ marshal_to_writer :: proc(w: io.Writer, v: any) -> Marshal_Error {
case runtime.Type_Info_Enumerated_Array: case runtime.Type_Info_Enumerated_Array:
index := runtime.type_info_base(info.index).variant.(runtime.Type_Info_Enum) index := runtime.type_info_base(info.index).variant.(runtime.Type_Info_Enum)
TREAT_AS_NORMAL_ARRAY_IF_POSSIBLE :: false io.write_byte(w, '[') or_return
if TREAT_AS_NORMAL_ARRAY_IF_POSSIBLE && len(index.values) == info.count { for i in 0..<info.count {
io.write_byte(w, '[') or_return if i > 0 { io.write_string(w, ", ") or_return }
for i in 0..<info.count {
if i > 0 { io.write_string(w, ", ") or_return }
data := uintptr(v.data) + uintptr(i*info.elem_size) data := uintptr(v.data) + uintptr(i*info.elem_size)
marshal_to_writer(w, any{rawptr(data), info.elem.id}) or_return marshal_to_writer(w, any{rawptr(data), info.elem.id}) or_return
}
io.write_byte(w, ']') or_return
} else {
io.write_byte(w, '{') or_return
count := 0
for field in soa_zip(name=index.names, value=index.values) {
if field.name == "" || field.name == "_" {
continue
}
if count > 0 { io.write_string(w, ", ") or_return }
count += 1
io.write_quoted_string(w, field.name) or_return
io.write_string(w, ": ") or_return
i := int(field.value-info.min_value)
data := uintptr(v.data) + uintptr(i*info.elem_size)
marshal_to_writer(w, any{rawptr(data), info.elem.id}) or_return
}
io.write_byte(w, '}') or_return
} }
io.write_byte(w, ']') or_return
case runtime.Type_Info_Dynamic_Array: case runtime.Type_Info_Dynamic_Array:
io.write_byte(w, '[') or_return io.write_byte(w, '[') or_return
array := cast(^mem.Raw_Dynamic_Array)v.data array := cast(^mem.Raw_Dynamic_Array)v.data
@@ -366,5 +342,5 @@ marshal_to_writer :: proc(w: io.Writer, v: any) -> Marshal_Error {
return .Unsupported_Type return .Unsupported_Type
} }
return .None return
} }