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

Allow map indices to be referenced &m[key] and return a valid pointer if it exists otherwise nil

Browse Source
This commit is contained in:
gingerBill
2020-03-24 15:48:31 +00:00
parent d57fbf48f0
commit da703edbf4
2 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/check_expr.cpp
View File

@@ -1648,8 +1648,11 @@ bool check_is_not_addressable(CheckerContext *c, Operand *o) {
return false;
}
return true;
}
if (o->mode == Addressing_MapIndex) {
return false;
}
if (o->mode != Addressing_Variable) {
return true;
}

15
src/ir.cpp
View File

@@ -3929,7 +3929,20 @@ irValue *ir_addr_get_ptr(irProcedure *proc, irAddr const &addr) {
}
switch (addr.kind) {
case irAddr_Map:
case irAddr_Map: {
Type *map_type = base_type(addr.map_type);
irValue *h = ir_gen_map_header(proc, addr.addr, map_type);
irValue *key = ir_gen_map_key(proc, addr.map_key, map_type->Map.key);
auto args = array_make<irValue *>(ir_allocator(), 2);
args[0] = h;
args[1] = key;
irValue *ptr = ir_emit_runtime_call(proc, "__dynamic_map_get", args);
return ir_emit_conv(proc, ptr, alloc_type_pointer(map_type->Map.value));
}
case irAddr_BitField: {
irValue *v = ir_addr_load(proc, addr);
return ir_address_from_load_or_generate_local(proc, v);