From 974d69ea3d0db71b97af00e325fdfb421c0906c2 Mon Sep 17 00:00:00 2001 From: Andrew Kelley Date: Thu, 28 Jan 2016 16:55:54 -0700 Subject: ability to call member functions directly see #14 --- src/codegen.cpp | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) (limited to 'src/codegen.cpp') diff --git a/src/codegen.cpp b/src/codegen.cpp index 6f4ba6c58f..97b03d14db 100644 --- a/src/codegen.cpp +++ b/src/codegen.cpp @@ -496,16 +496,25 @@ static LLVMValueRef gen_fn_call_expr(CodeGen *g, AstNode *node) { assert(struct_type->data.pointer.child_type->id == TypeTableEntryIdStruct); fn_table_entry = node->data.fn_call_expr.fn_entry; } else if (struct_type->id == TypeTableEntryIdMetaType) { - TypeTableEntry *enum_type = get_type_for_type_node(first_param_expr); - int param_count = node->data.fn_call_expr.params.length; - AstNode *arg1_node; - if (param_count == 1) { - arg1_node = node->data.fn_call_expr.params.at(0); + TypeTableEntry *child_type = get_type_for_type_node(first_param_expr); + + if (child_type->id == TypeTableEntryIdEnum) { + int param_count = node->data.fn_call_expr.params.length; + AstNode *arg1_node; + if (param_count == 1) { + arg1_node = node->data.fn_call_expr.params.at(0); + } else { + assert(param_count == 0); + arg1_node = nullptr; + } + return gen_enum_value_expr(g, fn_ref_expr, child_type, arg1_node); + } else if (child_type->id == TypeTableEntryIdStruct) { + struct_type = nullptr; + first_param_expr = nullptr; + fn_table_entry = node->data.fn_call_expr.fn_entry; } else { - assert(param_count == 0); - arg1_node = nullptr; + zig_unreachable(); } - return gen_enum_value_expr(g, fn_ref_expr, enum_type, arg1_node); } else { zig_unreachable(); } -- cgit v1.2.3