authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2016-01-05 16:34:51-07:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2016-01-05 16:34:51-07:00
logd006ea98dde667947395c0e7ee95fff20ada6df3
tree1539f61d881d4f8f4a18aaeb3028179651cfb57b
parent4ce0fcb569ffa1c0807aaada4ded802816272b75

analyze: ability to call a method on a struct pointer

1 files changed, 7 insertions(+), 8 deletions(-)

src/analyze.cpp+7-8
......@@ -853,7 +853,7 @@ static TypeTableEntry * resolve_rhs_number_literal(CodeGen *g, AstNode *non_lite
853853 assert(literal_node->codegen_node);
854854 NumberLiteralNode *codegen_num_lit = &literal_node->codegen_node->data.num_lit_node;
855855
856 if (num_lit_fits_in_other_type(g, literal_type, non_literal_type)) {
856 if (non_literal_type && num_lit_fits_in_other_type(g, literal_type, non_literal_type)) {
857857 assert(!codegen_num_lit->resolved_type);
858858 codegen_num_lit->resolved_type = non_literal_type;
859859 return non_literal_type;
......@@ -1711,13 +1711,8 @@ static TypeTableEntry *analyze_compiler_fn_type(CodeGen *g, ImportTableEntry *im
17111711 uint64_t size_in_bytes = type_entry->size_in_bits / 8;
17121712
17131713 TypeTableEntry *num_lit_type = get_number_literal_type_unsigned(g, size_in_bytes);
1714
1715 NumberLiteralNode *codegen_num_lit = &node->codegen_node->data.num_lit_node;
1716 assert(!codegen_num_lit->resolved_type);
1717 codegen_num_lit->resolved_type = resolve_type_compatibility(g, context, node,
1718 expected_type, num_lit_type);
1719
1720 return num_lit_type;
1714 TypeTableEntry *resolved_type = resolve_rhs_number_literal(g, nullptr, expected_type, node, num_lit_type);
1715 return resolved_type ? resolved_type : num_lit_type;
17211716 } else if (buf_eql_str(name, "min_value")) {
17221717 return analyze_min_max_value(g, node, type_entry, "no min value available for type '%s'");
17231718 } else if (buf_eql_str(name, "max_value")) {
......@@ -1744,6 +1739,10 @@ static TypeTableEntry *analyze_fn_call_expr(CodeGen *g, ImportTableEntry *import
17441739 name = &fn_ref_expr->data.field_access_expr.field_name;
17451740 if (struct_type->id == TypeTableEntryIdStruct) {
17461741 fn_table = &struct_type->data.structure.fn_table;
1742 } else if (struct_type->id == TypeTableEntryIdPointer &&
1743 struct_type->data.pointer.child_type->id == TypeTableEntryIdStruct)
1744 {
1745 fn_table = &struct_type->data.pointer.child_type->data.structure.fn_table;
17471746 } else if (struct_type->id == TypeTableEntryIdInvalid) {
17481747 return struct_type;
17491748 } else {