diff options
| author | gingerBill <bill@gingerbill.org> | 2019-12-31 16:54:50 +0000 |
|---|---|---|
| committer | gingerBill <bill@gingerbill.org> | 2019-12-31 16:54:50 +0000 |
| commit | 978d7fcb999181bc04bb612d19f514d67a823976 (patch) | |
| tree | c2b95c9989ba7fdd2ba81339519d1d5b6358d0ef /core/runtime | |
| parent | b267a5964d014c870ccfa3f068410351d07256fa (diff) | |
Fix typeid information for enumerated arrays
Diffstat (limited to 'core/runtime')
| -rw-r--r-- | core/runtime/core.odin | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/core/runtime/core.odin b/core/runtime/core.odin index 845f1cc22..f24a7a0f0 100644 --- a/core/runtime/core.odin +++ b/core/runtime/core.odin @@ -192,6 +192,7 @@ Typeid_Kind :: enum u8 { Pointer, Procedure, Array, + Enumerated_Array, Dynamic_Array, Slice, Tuple, @@ -280,10 +281,10 @@ Logger :: struct { } Context :: struct { - allocator: Allocator, - temp_allocator: Allocator, + allocator: Allocator, + temp_allocator: Allocator, assertion_failure_proc: Assertion_Failure_Proc, - logger: Logger, + logger: Logger, stdin: os.Handle, stdout: os.Handle, @@ -294,8 +295,6 @@ Context :: struct { user_data: any, user_ptr: rawptr, user_index: int, - - derived: any, // May be used for derived data types } @@ -488,14 +487,14 @@ default_assertion_failure_proc :: proc(prefix, message: string, loc: Source_Code @builtin copy_slice :: proc "contextless" (dst, src: $T/[]$E) -> int { n := max(0, min(len(dst), len(src))); - if n > 0 do mem_copy(&dst[0], &src[0], n*size_of(E)); + #no_bounds_check if n > 0 do mem_copy(&dst[0], &src[0], n*size_of(E)); return n; } @builtin copy_from_string :: proc "contextless" (dst: $T/[]$E/u8, src: $S/string) -> int { n := max(0, min(len(dst), len(src))); if n > 0 { - d := &dst[0]; + d := (transmute(Raw_Slice)dst).data; s := (transmute(Raw_String)src).data; mem_copy(d, s, n); } @@ -511,7 +510,7 @@ copy :: proc{copy_slice, copy_from_string}; pop :: proc "contextless" (array: ^$T/[dynamic]$E) -> E { if array == nil do return E{}; assert(len(array) > 0); - res := array[len(array)-1]; + res := #no_bounds_check array[len(array)-1]; (^Raw_Dynamic_Array)(array).len -= 1; return res; } |