From 1f7ec741fa5b1d9ba3826e06a8a8a0feec58876f Mon Sep 17 00:00:00 2001 From: Andrew Kelley Date: Tue, 23 Aug 2016 15:05:26 -0700 Subject: implement `?return` expression --- src/analyze.cpp | 29 ++++++++++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) (limited to 'src/analyze.cpp') diff --git a/src/analyze.cpp b/src/analyze.cpp index 4899ec533d..639444c6cf 100644 --- a/src/analyze.cpp +++ b/src/analyze.cpp @@ -6271,7 +6271,34 @@ static TypeTableEntry *analyze_return_expr(CodeGen *g, ImportTableEntry *import, } } case ReturnKindMaybe: - zig_panic("TODO"); + { + TypeTableEntry *expected_maybe_type; + if (expected_type) { + expected_maybe_type = get_maybe_type(g, expected_type); + } else { + expected_maybe_type = nullptr; + } + TypeTableEntry *resolved_type = analyze_expression(g, import, context, expected_maybe_type, + node->data.return_expr.expr); + if (resolved_type->id == TypeTableEntryIdInvalid) { + return resolved_type; + } else if (resolved_type->id == TypeTableEntryIdMaybe) { + TypeTableEntry *return_type = context->fn_entry->type_entry->data.fn.fn_type_id.return_type; + if (return_type->id != TypeTableEntryIdMaybe) { + ErrorMsg *msg = add_node_error(g, node, + buf_sprintf("?return statement in function with return type '%s'", + buf_ptr(&return_type->name))); + AstNode *return_type_node = context->fn_entry->fn_def_node->data.fn_def.fn_proto->data.fn_proto.return_type; + add_error_note(g, msg, return_type_node, buf_sprintf("function return type here")); + } + + return resolved_type->data.maybe.child_type; + } else { + add_node_error(g, node->data.return_expr.expr, + buf_sprintf("expected maybe type, got '%s'", buf_ptr(&resolved_type->name))); + return g->builtin_types.entry_invalid; + } + } } zig_unreachable(); } -- cgit v1.2.3