mirrors/Odin
1
0
Fork 0
mirror of https://github.com/odin-lang/Odin.git synced 2026-05-03 19:44:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix mem.new_clone

Browse Source
This commit is contained in:
Jeroen van Rijn
2021-09-19 22:19:06 +02:00
parent bf15e63130
commit eb9665f836
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/c/frontend/tokenizer/token.odin
View File

@@ -83,13 +83,13 @@ Token :: struct {
Is_Keyword_Proc :: #type proc(tok: ^Token) -> bool
copy_token :: proc(tok: ^Token) -> ^Token {
t := new_clone(tok^)
t, _ := new_clone(tok^)
t.next = nil
return t
}
new_eof :: proc(tok: ^Token) -> ^Token {
t := new_clone(tok^)
t, _ := new_clone(tok^)
t.kind = .EOF
t.lit = ""
return t

9
core/mem/alloc.odin
View File

@@ -215,13 +215,14 @@ new_aligned :: proc($T: typeid, alignment: int, allocator := context.allocator,
t = (^T)(raw_data(data))
return
}
new_clone :: proc(data: $T, allocator := context.allocator, loc := #caller_location) -> ^T {
data := alloc_bytes(size_of(T), alignment, allocator, loc) or_return
t = (^T)(raw_data(data))
new_clone :: proc(data: $T, allocator := context.allocator, loc := #caller_location) -> (t: ^T, err: Allocator_Error) {
backing := alloc_bytes(size_of(T), align_of(T), allocator, loc) or_return
t = (^T)(raw_data(backing))
if t != nil {
t^ = data
return t, nil
}
return
return nil, .Out_Of_Memory
}
DEFAULT_RESERVE_CAPACITY :: 16