ed/Odin
1
0
Fork 0
mirror of https://github.com/Ed94/Odin.git synced 2026-08-04 14:48:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix opening file without close; Minor fixes

Browse Source
This commit is contained in:
gingerBill
2017-11-09 22:58:44 +00:00
parent eb4b3f5976
commit e5c39fb2a9
4 changed files with 22 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/_preload.odin
+12 -24
View File
@@ -207,7 +207,7 @@ __Map_Header :: struct #ordered {
is_key_string: bool,
entry_size: int,
entry_align: int,
value_offset: int,
value_offset: uintptr,
value_size: int,
}
@@ -217,8 +217,11 @@ type_info_base :: proc(info: ^Type_Info) -> ^Type_Info {
if info == nil do return nil;
base := info;
switch i in base.variant {
case Type_Info_Named: base = i.base;
loop: for {
switch i in base.variant {
case Type_Info_Named: base = i.base;
case: break loop;
}
}
return base;
}
@@ -228,9 +231,12 @@ type_info_base_without_enum :: proc(info: ^Type_Info) -> ^Type_Info {
if info == nil do return nil;
base := info;
switch i in base.variant {
case Type_Info_Named: base = i.base;
case Type_Info_Enum: base = i.base;
loop: for {
switch i in base.variant {
case Type_Info_Named: base = i.base;
case Type_Info_Enum: base = i.base;
case: break loop;
}
}
return base;
}
@@ -877,24 +883,6 @@ __dynamic_array_append_nothing :: proc(array_: rawptr, elem_size, elem_align: in
return array.len;
}
__slice_append :: proc(slice_: rawptr, elem_size, elem_align: int,
items: rawptr, item_count: int) -> int {
slice := cast(^raw.Slice)slice_;
if item_count <= 0 || items == nil {
return slice.len;
}
item_count = min(slice.cap-slice.len, item_count);
if item_count > 0 {
data := cast(^u8)slice.data;
assert(data != nil);
__mem_copy(data + (elem_size*slice.len), items, elem_size * item_count);
slice.len += item_count;
}
return slice.len;
}
// Map stuff
__default_hash :: proc(data: []u8) -> u128 {