ed/Odin
1
0
Fork 0
mirror of https://github.com/Ed94/Odin.git synced 2026-06-23 22:25:00 -07:00
Code Issues Packages Projects Releases Wiki Activity

Keep -vet happy

Browse Source
This commit is contained in:
gingerBill
2024-04-15 14:35:51 +01:00
parent d5e6d722d3
commit 38c1fd5824
4 changed files with 17 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/encoding/cbor/cbor.odin
+2 -2
View File
@@ -428,7 +428,7 @@ to_diagnostic_format_writer :: proc(w: io.Writer, val: Value, padding := 0) -> i
}
}
padding := dedent(padding)
padding = dedent(padding)
newline(w, padding) or_return
io.write_string(w, "]") or_return
@@ -453,7 +453,7 @@ to_diagnostic_format_writer :: proc(w: io.Writer, val: Value, padding := 0) -> i
}
}
padding := dedent(padding)
padding = dedent(padding)
newline(w, padding) or_return
io.write_string(w, "}") or_return
core/encoding/cbor/coding.odin
+4 -2
View File
@@ -377,6 +377,7 @@ _decode_bytes_ptr :: proc(d: Decoder, add: Add, type: Major = .Bytes) -> (v: ^By
_decode_bytes :: proc(d: Decoder, add: Add, type: Major = .Bytes, allocator := context.allocator) -> (v: Bytes, err: Decode_Error) {
context.allocator = allocator
add := add
n, scap := _decode_len_str(d, add) or_return
buf := strings.builder_make(0, scap) or_return
@@ -385,8 +386,9 @@ _decode_bytes :: proc(d: Decoder, add: Add, type: Major = .Bytes, allocator := c
if n == -1 {
indefinite_loop: for {
header := _decode_header(d.reader) or_return
maj, add := _header_split(header)
header := _decode_header(d.reader) or_return
maj: Major
maj, add = _header_split(header)
#partial switch maj {
case type:
iter_n, iter_cap := _decode_len_str(d, add) or_return
core/encoding/cbor/marshal.odin
+5 -8
View File
@@ -208,7 +208,6 @@ marshal_into_encoder :: proc(e: Encoder, v: any) -> (err: Marshal_Error) {
}
case runtime.Type_Info_Boolean:
val: bool
switch b in a {
case bool: return _encode_bool(e.writer, b)
case b8: return _encode_bool(e.writer, bool(b))
@@ -231,7 +230,7 @@ marshal_into_encoder :: proc(e: Encoder, v: any) -> (err: Marshal_Error) {
return
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)
err_conv(_encode_u64(e, u64(info.count), .Array)) or_return
for i in 0..<info.count {
data := uintptr(v.data) + uintptr(i*info.elem_size)
@@ -480,7 +479,7 @@ marshal_into_encoder :: proc(e: Encoder, v: any) -> (err: Marshal_Error) {
entries := make([dynamic]Name, 0, n, e.temp_allocator) or_return
defer delete(entries)
for name, i in info.names {
for _, i in info.names {
fname := field_name(info, i)
if fname == "-" {
continue
@@ -498,7 +497,7 @@ marshal_into_encoder :: proc(e: Encoder, v: any) -> (err: Marshal_Error) {
marshal_entry(e, info, v, entry.name, entry.field) or_return
}
} else {
for name, i in info.names {
for _, i in info.names {
fname := field_name(info, i)
if fname == "-" {
continue
@@ -514,14 +513,12 @@ marshal_into_encoder :: proc(e: Encoder, v: any) -> (err: Marshal_Error) {
case Value: return err_conv(encode(e, vv))
}
tag := reflect.get_union_variant_raw_tag(v)
if v.data == nil || tag <= 0 {
id := reflect.union_variant_typeid(v)
if v.data == nil || id == nil {
return _encode_nil(e.writer)
}
id := info.variants[tag-1].id
if len(info.variants) == 1 {
id := info.variants[tag-1].id
return marshal_into(e, any{v.data, id})
}
core/encoding/cbor/unmarshal.odin
+6 -6
View File
@@ -518,7 +518,7 @@ _unmarshal_array :: proc(d: Decoder, v: any, ti: ^reflect.Type_Info, hdr: Header
return
case reflect.Type_Info_Array:
_length, scap := err_conv(_decode_len_container(d, add)) or_return
_, scap := err_conv(_decode_len_container(d, add)) or_return
length := min(scap, t.count)
if length > t.count {
@@ -532,7 +532,7 @@ _unmarshal_array :: proc(d: Decoder, v: any, ti: ^reflect.Type_Info, hdr: Header
return
case reflect.Type_Info_Enumerated_Array:
_length, scap := err_conv(_decode_len_container(d, add)) or_return
_, scap := err_conv(_decode_len_container(d, add)) or_return
length := min(scap, t.count)
if length > t.count {
@@ -546,7 +546,7 @@ _unmarshal_array :: proc(d: Decoder, v: any, ti: ^reflect.Type_Info, hdr: Header
return
case reflect.Type_Info_Complex:
_length, scap := err_conv(_decode_len_container(d, add)) or_return
_, scap := err_conv(_decode_len_container(d, add)) or_return
length := min(scap, 2)
if length > 2 {
@@ -568,7 +568,7 @@ _unmarshal_array :: proc(d: Decoder, v: any, ti: ^reflect.Type_Info, hdr: Header
return
case reflect.Type_Info_Quaternion:
_length, scap := err_conv(_decode_len_container(d, add)) or_return
_, scap := err_conv(_decode_len_container(d, add)) or_return
length := min(scap, 4)
if length > 4 {
@@ -628,7 +628,7 @@ _unmarshal_map :: proc(d: Decoder, v: any, ti: ^reflect.Type_Info, hdr: Header,
return _unsupported(v, hdr)
}
length, scap := err_conv(_decode_len_container(d, add)) or_return
length, _ := err_conv(_decode_len_container(d, add)) or_return
unknown := length == -1
fields := reflect.struct_fields_zipped(ti.id)
@@ -672,7 +672,7 @@ _unmarshal_map :: proc(d: Decoder, v: any, ti: ^reflect.Type_Info, hdr: Header,
}
field := fields[use_field_idx]
name := field.name
// name := field.name
ptr := rawptr(uintptr(v.data) + field.offset)
fany := any{ptr, field.type.id}
_unmarshal_value(d, fany, _decode_header(r) or_return) or_return