for in iteration of Enum Type (request from issue #58)

This commit is contained in:
Ginger Bill
2017-05-01 10:02:25 +01:00
parent 04f5fff7fa
commit aceabb2f2f
3 changed files with 69 additions and 11 deletions

View File

@@ -20,9 +20,13 @@ Vec2 :: [vector 2]f32;
Vec3 :: [vector 3]f32;
Vec4 :: [vector 4]f32;
Mat2 :: [2]Vec2;
Mat3 :: [3]Vec3;
Mat4 :: [4]Vec4;
// Column major
Mat2 :: [2][2]f32;
Mat3 :: [3][3]f32;
Mat4 :: [4][4]f32;
Complex :: complex64;
Quat :: quaternion128;
sqrt :: proc(x: f32) -> f32 #foreign __llvm_core "llvm.sqrt.f32";
sqrt :: proc(x: f64) -> f64 #foreign __llvm_core "llvm.sqrt.f64";
@@ -317,10 +321,10 @@ look_at :: proc(eye, centre, up: Vec3) -> Mat4 {
m: Mat4;
m[0] = Vec4{+s.x, +s.y, +s.z, 0};
m[1] = Vec4{+u.x, +u.y, +u.z, 0};
m[2] = Vec4{-f.x, -f.y, -f.z, 0};
m[3] = Vec4{dot(s, eye), dot(u, eye), dot(f, eye), 1};
m[0] = [4]f32{+s.x, +s.y, +s.z, 0};
m[1] = [4]f32{+u.x, +u.y, +u.z, 0};
m[2] = [4]f32{-f.x, -f.y, -f.z, 0};
m[3] = [4]f32{dot(s, eye), dot(u, eye), dot(f, eye), 1};
return m;
}

View File

@@ -920,9 +920,21 @@ void check_stmt_internal(Checker *c, AstNode *node, u32 flags) {
idx = t_int;
} else {
Operand operand = {Addressing_Invalid};
check_expr(c, &operand, rs->expr);
check_expr_or_type(c, &operand, rs->expr);
if (operand.mode != Addressing_Invalid) {
if (operand.mode == Addressing_Type) {
if (!is_type_enum(operand.type)) {
gbString t = type_to_string(operand.type);
error_node(operand.expr, "Cannot iterate over the type `%s`", t);
gb_string_free(t);
goto skip_expr;
} else {
val = operand.type;
idx = t_int;
add_type_info_type(c, operand.type);
goto skip_expr;
}
} else if (operand.mode != Addressing_Invalid) {
Type *t = base_type(type_deref(operand.type));
switch (t->kind) {
case Type_Basic:

View File

@@ -4785,10 +4785,10 @@ irAddr ir_build_addr(irProcedure *proc, AstNode *expr) {
if (is_type_enum(type)) {
irValue *enum_info = ir_emit_conv(proc, ti_ptr, t_type_info_enum_ptr);
names_ptr = ir_emit_struct_ep(proc, enum_info, 1);
names_ptr = ir_emit_struct_ep(proc, enum_info, 3);
} else if (type->kind == Type_Record) {
irValue *record_info = ir_emit_conv(proc, ti_ptr, t_type_info_record_ptr);
names_ptr = ir_emit_struct_ep(proc, record_info, 1);
names_ptr = ir_emit_struct_ep(proc, record_info, 3);
}
return ir_addr(names_ptr);
} else {
@@ -6140,8 +6140,50 @@ void ir_build_stmt_internal(irProcedure *proc, AstNode *node) {
irBlock *done = NULL;
AstNode *expr = unparen_expr(rs->expr);
TypeAndValue *tav = type_and_value_of_expression(proc->module->info, expr);
if (is_ast_node_a_range(expr)) {
ir_build_range_interval(proc, &expr->BinaryExpr, val_type, &val, &index, &loop, &done);
} else if (tav->mode == Addressing_Type) {
TokenPos pos = ast_node_token(expr).pos;
gbAllocator a = proc->module->allocator;
Type *t = tav->type;
GB_ASSERT(is_type_enum(t));
Type *enum_ptr = make_type_pointer(a, t);
t = base_type(t);
i64 enum_count = t->Record.field_count;
irValue *max_count = ir_const_int(a, enum_count);
irValue *eti = ir_emit_union_cast(proc, ir_type_info(proc, t), t_type_info_enum_ptr, pos);
irValue *values = ir_emit_load(proc, ir_emit_struct_ep(proc, eti, 4));
irValue *values_data = ir_slice_elem(proc, values);
irValue *offset_ = ir_add_local_generated(proc, t_int);
ir_emit_store(proc, offset_, v_zero);
loop = ir_new_block(proc, NULL, "for.enum.loop");
ir_emit_jump(proc, loop);
ir_start_block(proc, loop);
irBlock *body = ir_new_block(proc, NULL, "for.enum.body");
done = ir_new_block(proc, NULL, "for.enum.done");
irValue *offset = ir_emit_load(proc, offset_);
irValue *cond = ir_emit_comp(proc, Token_Lt, offset, max_count);
ir_emit_if(proc, cond, body, done);
ir_start_block(proc, body);
irValue *val_ptr = ir_emit_ptr_offset(proc, values_data, offset);
val_ptr = ir_emit_conv(proc, val_ptr, enum_ptr);
ir_emit_increment(proc, offset_);
index = offset;
if (val_type != NULL) {
val = ir_emit_load(proc, val_ptr);
}
} else {
Type *expr_type = type_of_expr(proc->module->info, rs->expr);
Type *et = base_type(type_deref(expr_type));