ed/Odin
1
0
Fork 0
mirror of https://github.com/Ed94/Odin.git synced 2026-07-13 23:01:24 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fix len, cap, comparison against nil for map

Browse Source
This commit is contained in:
gingerBill
2017-12-18 20:43:02 +00:00
parent b509946b13
commit a17310a83c
2 changed files with 34 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/_preload.odin
+14 -4
View File
@@ -921,6 +921,20 @@ __dynamic_map_check_init :: proc(h: __Map_Header) {
}
}
__dynamic_map_len :: inline proc "contextless" (p: rawptr) -> int {
if m := transmute(raw.Map)p; m.internal != nil {
return m.internal.entries.len;
}
return 0;
}
__dynamic_map_cap :: inline proc "contextless" (p: rawptr) -> int {
if m := transmute(raw.Map)p; m.internal != nil {
return m.internal.entries.cap;
}
return 0;
}
__dynamic_map_reserve :: proc(using header: __Map_Header, cap: int, loc := #caller_location) {
__dynamic_map_check_init(header);
__dynamic_array_reserve(&m.hashes, size_of(int), align_of(int), cap, loc);
@@ -1094,7 +1108,3 @@ __dynamic_map_erase :: proc(using h: __Map_Header, fr: __Map_Find_Result) {
m.hashes[last.hash_index] = fr.entry_index;
}
}
__map_for_test :: proc "c" (s: string) {
fmt.printf("__map_for_test '%s'\n", s);
}
src/ir.cpp
+20 -16
View File
@@ -2074,6 +2074,22 @@ irValue *ir_build_addr_ptr(irProcedure *proc, AstNode *expr) {
irValue *ir_map_count(irProcedure *proc, irValue *value) {
GB_ASSERT(is_type_map(ir_type(value)));
irValue **args = gb_alloc_array(proc->module->allocator, irValue *, 1);
args[0] = ir_emit_transmute(proc, value, t_rawptr);
return ir_emit_global_call(proc, "__dynamic_map_len", args, 1);
}
irValue *ir_map_capacity(irProcedure *proc, irValue *value) {
GB_ASSERT(is_type_map(ir_type(value)));
irValue **args = gb_alloc_array(proc->module->allocator, irValue *, 1);
args[0] = ir_emit_transmute(proc, value, t_rawptr);
return ir_emit_global_call(proc, "__dynamic_map_cap", args, 1);
}
irValue *ir_emit_array_epi(irProcedure *proc, irValue *s, i32 index);
irValue *ir_emit_struct_ev(irProcedure *proc, irValue *s, i32 index);
@@ -2350,15 +2366,8 @@ irValue *ir_emit_comp_against_nil(irProcedure *proc, TokenKind op_kind, irValue
return ir_emit_arith(proc, Token_And, a, b, t_bool);
}
} else if (is_type_map(t)) {
irValue *hashes = ir_emit_struct_ev(proc, x, 0);
irValue *entries = ir_emit_struct_ev(proc, x, 1);
irValue *a = ir_emit_comp_against_nil(proc, op_kind, hashes);
irValue *b = ir_emit_comp_against_nil(proc, op_kind, entries);
if (op_kind == Token_CmpEq) {
return ir_emit_arith(proc, Token_Or, a, b, t_bool);
} else if (op_kind == Token_NotEq) {
return ir_emit_arith(proc, Token_And, a, b, t_bool);
}
irValue *len = ir_map_count(proc, x);
return ir_emit_comp(proc, op_kind, len, v_zero);
} else if (is_type_union(t)) {
irValue *tag = ir_emit_union_tag_value(proc, x);
return ir_emit_comp(proc, op_kind, tag, v_zero);
@@ -2815,8 +2824,6 @@ irValue *ir_emit_string(irProcedure *proc, irValue *elem, irValue *len) {
}
irValue *ir_add_local_slice(irProcedure *proc, Type *slice_type, irValue *base, irValue *low, irValue *high) {
// TODO(bill): array bounds checking for slice creation
// TODO(bill): check that low < high <= max
@@ -4052,9 +4059,7 @@ irValue *ir_build_builtin_proc(irProcedure *proc, AstNode *expr, TypeAndValue tv
} else if (is_type_dynamic_array(t)) {
return ir_dynamic_array_count(proc, v);
} else if (is_type_map(t)) {
ir_emit_comment(proc, str_lit("len: map"));
irValue *entries = ir_emit_struct_ev(proc, v, 1);
return ir_dynamic_array_count(proc, entries);
return ir_map_count(proc, v);
}
GB_PANIC("Unreachable");
@@ -4078,8 +4083,7 @@ irValue *ir_build_builtin_proc(irProcedure *proc, AstNode *expr, TypeAndValue tv
} else if (is_type_dynamic_array(t)) {
return ir_dynamic_array_capacity(proc, v);
} else if (is_type_map(t)) {
irValue *entries = ir_emit_struct_ev(proc, v, 1);
return ir_dynamic_array_capacity(proc, entries);
return ir_map_capacity(proc, v);
}
GB_PANIC("Unreachable");