mirrors/Odin
1
0
Fork 0
mirror of https://github.com/odin-lang/Odin.git synced 2026-02-23 11:26:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Support for and inline for for enumerated arrays

Browse Source
This commit is contained in:
gingerBill
2019-12-27 17:16:43 +00:00
parent 5ec8dd166a
commit ceef5db547
2 changed files with 54 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/check_stmt.cpp
View File

@@ -652,6 +652,11 @@ void check_inline_range_stmt(CheckerContext *ctx, Ast *node, u32 mod_flags) {
val1 = t_int;
inline_for_depth = exact_value_i64(t->Array.count);
break;
case Type_EnumeratedArray:
val0 = t->EnumeratedArray.elem;
val1 = t->EnumeratedArray.index;
inline_for_depth = exact_value_i64(t->EnumeratedArray.count);
break;
}
}
@@ -1506,6 +1511,12 @@ void check_stmt_internal(CheckerContext *ctx, Ast *node, u32 flags) {
add_package_dependency(ctx, "runtime", "string_decode_rune");
}
break;
case Type_EnumeratedArray:
val0 = t->EnumeratedArray.elem;
val1 = t->EnumeratedArray.index;
break;
case Type_Array:
val0 = t->Array.elem;
val1 = t_int;

43
src/ir.cpp
View File

@@ -9137,6 +9137,17 @@ void ir_build_range_indexed(irProcedure *proc, irValue *expr, Type *val_type, ir
}
break;
}
case Type_EnumeratedArray: {
if (val_type != nullptr) {
val = ir_emit_load(proc, ir_emit_array_ep(proc, expr, idx));
// NOTE(bill): Override the idx value for the enumeration
Type *index_type =expr_type->EnumeratedArray.index;
if (compare_exact_values(Token_NotEq, expr_type->EnumeratedArray.min_value, exact_value_u64(0))) {
idx = ir_emit_arith(proc, Token_Add, idx, ir_value_constant(index_type, expr_type->EnumeratedArray.min_value), index_type);
}
}
break;
}
case Type_Slice: {
if (val_type != nullptr) {
irValue *elem = ir_slice_elem(proc, expr);
@@ -9869,6 +9880,17 @@ void ir_build_stmt_internal(irProcedure *proc, Ast *node) {
ir_build_range_indexed(proc, array, val0_type, count_ptr, &val, &key, &loop, &done);
break;
}
case Type_EnumeratedArray: {
irValue *count_ptr = nullptr;
irValue *array = ir_build_addr_ptr(proc, expr);
if (is_type_pointer(type_deref(ir_type(array)))) {
array = ir_emit_load(proc, array);
}
count_ptr = ir_add_local_generated(proc, t_int, false);
ir_emit_store(proc, count_ptr, ir_const_int(et->EnumeratedArray.count));
ir_build_range_indexed(proc, array, val0_type, count_ptr, &val, &key, &loop, &done);
break;
}
case Type_DynamicArray: {
irValue *count_ptr = nullptr;
irValue *array = ir_build_addr_ptr(proc, expr);
@@ -10072,6 +10094,27 @@ void ir_build_stmt_internal(irProcedure *proc, Ast *node) {
ir_build_stmt(proc, rs->body);
}
}
break;
case Type_EnumeratedArray:
if (t->EnumeratedArray.count > 0) {
irValue *val = ir_build_expr(proc, expr);
irValue *val_addr = ir_address_from_load_or_generate_local(proc, val);
for (i64 i = 0; i < t->EnumeratedArray.count; i++) {
if (val0_type) {
// NOTE(bill): Due to weird legacy issues in LLVM, this needs to be an i32
irValue *elem = ir_emit_array_epi(proc, val_addr, cast(i32)i);
ir_addr_store(proc, val0_addr, ir_emit_load(proc, elem));
}
if (val1_type) {
ExactValue idx = exact_value_add(exact_value_i64(i), t->EnumeratedArray.min_value);
ir_addr_store(proc, val1_addr, ir_value_constant(val1_type, idx));
}
ir_build_stmt(proc, rs->body);
}
}
break;
default: