@@ -35,7 +35,7 @@ dynamic_destroy :: proc(m: ^$D/Dynamic_Handle_Map($T, $Handle_Type)) {
3535dynamic_add :: proc (m: ^$D /Dynamic_Handle_Map ($T , $Handle_Type ), item: T, loc := #caller_location ) -> (handle: Handle_Type, err: runtime.Allocator_Error) {
3636 if xar.len (m.unused_items) > 0 {
3737 i := xar.pop (&m.unused_items)
38- ptr := xar.get_ptr (&m.items, i, loc )
38+ ptr := xar.get_ptr_unsafe (&m.items, i)
3939 prev_gen := ptr.handle.gen
4040 ptr^ = item
4141
@@ -51,7 +51,7 @@ dynamic_add :: proc(m: ^$D/Dynamic_Handle_Map($T, $Handle_Type), item: T, loc :=
5151
5252 i := xar.append (&m.items, item, loc) or_return
5353
54- ptr := xar.get_ptr (&m.items, i, loc )
54+ ptr := xar.get_ptr_unsafe (&m.items, i)
5555 ptr^ = item
5656
5757 ptr.handle.idx = auto_cast i
@@ -60,11 +60,11 @@ dynamic_add :: proc(m: ^$D/Dynamic_Handle_Map($T, $Handle_Type), item: T, loc :=
6060}
6161
6262@(require_results)
63- dynamic_get :: proc (m: ^$D /Dynamic_Handle_Map ($T , $Handle_Type ), h: Handle_Type) -> (^T, bool ) #optional_ok {
63+ dynamic_get :: proc " contextless " (m: ^$D /Dynamic_Handle_Map ($T , $Handle_Type ), h: Handle_Type) -> (^T, bool ) #optional_ok {
6464 if h.idx <= 0 || int (u32 (h.idx)) >= xar.len (m.items) {
6565 return nil , false
6666 }
67- if e := xar.get_ptr (&m.items, h.idx); e.handle == h {
67+ if e := xar.get_ptr_unsafe (&m.items, h.idx); e.handle == h {
6868 return e, true
6969 }
7070 return nil , false
@@ -85,24 +85,24 @@ dynamic_remove :: proc(m: ^$D/Dynamic_Handle_Map($T, $Handle_Type), h: Handle_Ty
8585}
8686
8787@(require_results)
88- dynamic_is_valid :: proc (m: ^$D /Dynamic_Handle_Map ($T , $Handle_Type ), h: Handle_Type, loc := #caller_location ) -> bool {
89- return h.idx > 0 && int (u32 (h.idx)) < xar.len (m.items) && xar.get (&m.items, h.idx, loc ).handle == h
88+ dynamic_is_valid :: proc " contextless " (m: ^$D /Dynamic_Handle_Map ($T , $Handle_Type ), h: Handle_Type) -> bool {
89+ return h.idx > 0 && int (u32 (h.idx)) < xar.len (m.items) && xar.get_ptr_unsafe (&m.items, h.idx).handle == h
9090}
9191
9292// Returns the number of possibly valid items in the handle map.
9393@(require_results)
94- dynamic_len :: proc (m: $D /Dynamic_Handle_Map ($T , $Handle_Type )) -> uint {
94+ dynamic_len :: proc " contextless " (m: $D /Dynamic_Handle_Map ($T , $Handle_Type )) -> uint {
9595 n := xar.len (m.items) - xar.len (m.unused_items)
9696 return uint (n-1 if n > 0 else 0 )
9797}
9898
9999@(require_results)
100- dynamic_cap :: proc (m: $D /Dynamic_Handle_Map ($T , $Handle_Type )) -> uint {
100+ dynamic_cap :: proc " contextless " (m: $D /Dynamic_Handle_Map ($T , $Handle_Type )) -> uint {
101101 n := xar.cap (m.items)
102102 return uint (n-1 if n > 0 else 0 )
103103}
104104
105- dynamic_clear :: proc (m: ^$D /Dynamic_Handle_Map ($T , $Handle_Type )) {
105+ dynamic_clear :: proc " contextless " (m: ^$D /Dynamic_Handle_Map ($T , $Handle_Type )) {
106106 xar.clear (&m.items)
107107 xar.clear (&m.unused_items)
108108}
@@ -116,7 +116,7 @@ Dynamic_Handle_Map_Iterator :: struct($D: typeid) {
116116
117117// Makes an iterator from a handle map.
118118@(require_results)
119- dynamic_iterator_make :: proc (m: ^$D /Dynamic_Handle_Map ($T , $Handle_Type )) -> Dynamic_Handle_Map_Iterator (D) {
119+ dynamic_iterator_make :: proc " contextless " (m: ^$D /Dynamic_Handle_Map ($T , $Handle_Type )) -> Dynamic_Handle_Map_Iterator (D) {
120120 return {m, 1 }
121121}
122122
@@ -129,9 +129,9 @@ dynamic_iterator_make :: proc(m: ^$D/Dynamic_Handle_Map($T, $Handle_Type)) -> Dy
129129 }
130130*/
131131@(require_results)
132- dynamic_iterate :: proc (it: ^$DHI /Dynamic_Handle_Map_Iterator ($D /Dynamic_Handle_Map ($T , $Handle_Type ))) -> (val: ^T, h: Handle_Type, ok: bool ) {
132+ dynamic_iterate :: proc " contextless " (it: ^$DHI /Dynamic_Handle_Map_Iterator ($D /Dynamic_Handle_Map ($T , $Handle_Type ))) -> (val: ^T, h: Handle_Type, ok: bool ) {
133133 for _ in it.index..<xar.len (it.m.items) {
134- e := xar.get_ptr (&it.m.items, it.index)
134+ e := xar.get_ptr_unsafe (&it.m.items, it.index)
135135 it.index += 1
136136
137137 if e.handle.idx != 0 {
0 commit comments