diff options
| author | gingerBill <bill@gingerbill.org> | 2021-08-31 22:21:13 +0100 |
|---|---|---|
| committer | gingerBill <bill@gingerbill.org> | 2021-08-31 22:21:13 +0100 |
| commit | 251da264ed6e0f039931683c7b0d4b97e88c8d99 (patch) | |
| tree | c7a9a088477d2452c2cf850458c62d994a211df6 /core/slice/map.odin | |
| parent | b176af27427a6c39448a71a8023e4a9877f0a51c (diff) | |
Remove unneeded semicolons from the core library
Diffstat (limited to 'core/slice/map.odin')
| -rw-r--r-- | core/slice/map.odin | 74 |
1 files changed, 37 insertions, 37 deletions
diff --git a/core/slice/map.odin b/core/slice/map.odin index d44b4b5b0..1c5512ceb 100644 --- a/core/slice/map.odin +++ b/core/slice/map.odin @@ -4,27 +4,27 @@ import "core:intrinsics" import "core:runtime" import "core:mem" -_ :: intrinsics; -_ :: runtime; -_ :: mem; +_ :: intrinsics +_ :: runtime +_ :: mem map_keys :: proc(m: $M/map[$K]$V, allocator := context.allocator) -> (keys: []K) { - keys = make(type_of(keys), len(m), allocator); - i := 0; + keys = make(type_of(keys), len(m), allocator) + i := 0 for key in m { - keys[i] = key; - i += 1; + keys[i] = key + i += 1 } - return; + return } map_values :: proc(m: $M/map[$K]$V, allocator := context.allocator) -> (values: []V) { - values = make(type_of(values), len(m), allocator); - i := 0; + values = make(type_of(values), len(m), allocator) + i := 0 for _, value in m { - values[i] = value; - i += 1; + values[i] = value + i += 1 } - return; + return } Map_Entry :: struct($Key, $Value: typeid) { @@ -40,42 +40,42 @@ Map_Entry_Info :: struct($Key, $Value: typeid) { map_entries :: proc(m: $M/map[$K]$V, allocator := context.allocator) -> (entries: []Map_Entry(K, V)) { - entries = make(type_of(entries), len(m), allocator); - i := 0; + entries = make(type_of(entries), len(m), allocator) + i := 0 for key, value in m { - entries[i].key = key; - entries[i].value = value; - i += 1; + entries[i].key = key + entries[i].value = value + i += 1 } - return; + return } map_entry_infos :: proc(m: $M/map[$K]$V, allocator := context.allocator) -> (entries: []Map_Entry_Info(K, V)) #no_bounds_check { - m := m; - rm := (^mem.Raw_Map)(&m); + m := m + rm := (^mem.Raw_Map)(&m) - info := runtime.type_info_base(type_info_of(M)).variant.(runtime.Type_Info_Map); - gs := runtime.type_info_base(info.generated_struct).variant.(runtime.Type_Info_Struct); - ed := runtime.type_info_base(gs.types[1]).variant.(runtime.Type_Info_Dynamic_Array); - entry_type := ed.elem.variant.(runtime.Type_Info_Struct); - key_offset := entry_type.offsets[2]; - value_offset := entry_type.offsets[3]; - entry_size := uintptr(ed.elem_size); + info := runtime.type_info_base(type_info_of(M)).variant.(runtime.Type_Info_Map) + gs := runtime.type_info_base(info.generated_struct).variant.(runtime.Type_Info_Struct) + ed := runtime.type_info_base(gs.types[1]).variant.(runtime.Type_Info_Dynamic_Array) + entry_type := ed.elem.variant.(runtime.Type_Info_Struct) + key_offset := entry_type.offsets[2] + value_offset := entry_type.offsets[3] + entry_size := uintptr(ed.elem_size) - entries = make(type_of(entries), rm.entries.len); + entries = make(type_of(entries), rm.entries.len) - data := uintptr(rm.entries.data); + data := uintptr(rm.entries.data) for i in 0..<rm.entries.len { - header := (^runtime.Map_Entry_Header)(data); + header := (^runtime.Map_Entry_Header)(data) - hash := header.hash; - key := (^K)(data + key_offset)^; - value := (^V)(data + value_offset)^; + hash := header.hash + key := (^K)(data + key_offset)^ + value := (^V)(data + value_offset)^ - entries[i] = {hash, key, value}; + entries[i] = {hash, key, value} - data += entry_size; + data += entry_size } - return; + return } |