ability to have struct to have a field which is slice of itself

closes #197
This commit is contained in:
Andrew Kelley 2016-09-25 13:39:46 -04:00
parent e06885d64e
commit 683da0e4ec
3 changed files with 52 additions and 3 deletions

View File

@ -1589,6 +1589,9 @@ static void resolve_struct_type(CodeGen *g, ImportTableEntry *import, TypeTableE
TypeTableEntry *field_type = type_struct_field->type_entry;
assert(field_type->type_ref);
assert(struct_type->type_ref);
assert(struct_type->data.structure.complete);
uint64_t debug_size_in_bits = 8*LLVMStoreSizeOfType(g->target_data_ref, field_type->type_ref);
uint64_t debug_align_in_bits = 8*LLVMABISizeOfType(g->target_data_ref, field_type->type_ref);
uint64_t debug_offset_in_bits = 8*LLVMOffsetOfElement(g->target_data_ref, struct_type->type_ref,
@ -4065,7 +4068,8 @@ static TypeTableEntry *analyze_array_type(CodeGen *g, ImportTableEntry *import,
{
AstNode *size_node = node->data.array_type.size;
TypeTableEntry *child_type = analyze_type_expr(g, import, context, node->data.array_type.child_type);
TypeTableEntry *child_type = analyze_type_expr_pointer_only(g, import, context,
node->data.array_type.child_type, true);
if (child_type->id == TypeTableEntryIdUnreachable) {
add_node_error(g, node, buf_create_from_str("array of unreachable not allowed"));
@ -4075,6 +4079,7 @@ static TypeTableEntry *analyze_array_type(CodeGen *g, ImportTableEntry *import,
}
if (size_node) {
child_type = analyze_type_expr(g, import, context, node->data.array_type.child_type);
TypeTableEntry *size_type = analyze_expression(g, import, context,
g->builtin_types.entry_usize, size_node);
if (size_type->id == TypeTableEntryIdInvalid) {
@ -4101,8 +4106,8 @@ static TypeTableEntry *analyze_array_type(CodeGen *g, ImportTableEntry *import,
return g->builtin_types.entry_invalid;
}
} else {
return resolve_expr_const_val_as_type(g, node,
get_slice_type(g, child_type, node->data.array_type.is_const), false);
TypeTableEntry *slice_type = get_slice_type(g, child_type, node->data.array_type.is_const);
return resolve_expr_const_val_as_type(g, node, slice_type, false);
}
}

View File

@ -0,0 +1,43 @@
const assert = @import("std").debug.assert;
struct Node {
payload: i32,
children: []Node,
}
#attribute("test")
fn structContainsSliceOfItself() {
var nodes = []Node {
Node {
.payload = 1,
.children = []Node{},
},
Node {
.payload = 2,
.children = []Node{},
},
Node {
.payload = 3,
.children = []Node{
Node {
.payload = 31,
.children = []Node{},
},
Node {
.payload = 32,
.children = []Node{},
},
},
},
};
const root = Node {
.payload = 1234,
.children = nodes[0...],
};
assert(root.payload == 1234);
assert(root.children[0].payload == 1);
assert(root.children[1].payload == 2);
assert(root.children[2].payload == 3);
assert(root.children[2].children[0].payload == 31);
assert(root.children[2].children[1].payload == 32);
}

View File

@ -14,6 +14,7 @@ const test_const_slice_child = @import("cases/const_slice_child.zig");
const test_switch_prong_implicit_cast = @import("cases/switch_prong_implicit_cast.zig");
const test_switch_prong_err_enum = @import("cases/switch_prong_err_enum.zig");
const test_enum_with_members = @import("cases/enum_with_members.zig");
const test_struct_contains_slice_of_itself = @import("cases/struct_contains_slice_of_itself.zig");
// normal comment
/// this is a documentation comment