mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2026-02-13 12:59:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

ir: support return expression

Browse Source
This commit is contained in:
Andrew Kelley 2016-10-29 19:24:59 -04:00
parent afc5507b64
commit 56cdaff9e7
2 changed files with 34 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/analyze.cpp
View File

@ -4970,11 +4970,6 @@ static TypeTableEntry *analyze_switch_expr(CodeGen *g, ImportTableEntry *import,
static TypeTableEntry *analyze_return_expr(CodeGen *g, ImportTableEntry *import, BlockContext *context,
TypeTableEntry *expected_type, AstNode *node)
{
if (!context->fn_entry) {
add_node_error(g, node, buf_sprintf("return expression outside function definition"));
return g->builtin_types.entry_invalid;
}
if (!node->data.return_expr.expr) {
node->data.return_expr.expr = create_ast_void_node(g, import, node);
normalize_parent_ptrs(node);
@ -4984,11 +4979,7 @@ static TypeTableEntry *analyze_return_expr(CodeGen *g, ImportTableEntry *import,
switch (node->data.return_expr.kind) {
case ReturnKindUnconditional:
{
analyze_expression(g, import, context, expected_return_type, node->data.return_expr.expr);
return g->builtin_types.entry_unreachable;
}
zig_panic("TODO moved to ir.cpp");
case ReturnKindError:
{
TypeTableEntry *expected_err_type;

41
src/ir.cpp
View File

@ -594,6 +594,37 @@ static void ir_gen_defers_for_block(IrBuilder *irb, BlockContext *inner_block, B
}
}
static IrInstruction *ir_gen_return(IrBuilder *irb, AstNode *node) {
assert(node->type == NodeTypeReturnExpr);
BlockContext *scope = node->block_context;
if (!scope->fn_entry) {
add_node_error(irb->codegen, node, buf_sprintf("return expression outside function definition"));
return irb->codegen->invalid_instruction;
}
AstNode *expr_node = node->data.return_expr.expr;
switch (node->data.return_expr.kind) {
case ReturnKindUnconditional:
{
IrInstruction *return_value;
if (expr_node) {
return_value = ir_gen_node(irb, expr_node, scope);
} else {
return_value = ir_build_const_void(irb, node);
}
return ir_build_return(irb, node, return_value);
}
case ReturnKindError:
zig_panic("TODO %%return");
case ReturnKindMaybe:
zig_panic("TODO ?return");
}
zig_unreachable();
}
//static IrInstruction *ir_gen_return(IrBuilder *irb, AstNode *source_node, IrInstruction *value, ReturnKnowledge rk) {
// BlockContext *defer_inner_block = source_node->block_context;
// BlockContext *defer_outer_block = irb->node->block_context;
@ -1230,15 +1261,9 @@ static IrInstruction *ir_gen_node_extra(IrBuilder *irb, AstNode *node, BlockCont
return ir_gen_while_expr(irb, node);
case NodeTypeArrayAccessExpr:
return ir_gen_array_access(irb, node, lval);
case NodeTypeUnwrapErrorExpr:
case NodeTypeReturnExpr:
// TODO
//if (!scope->fn_entry) {
// add_node_error(ira->codegen, source_node,
// buf_sprintf("return expression outside function definition"));
// return ira->codegen->builtin_types.entry_invalid;
//}
return ir_gen_return(irb, node);
case NodeTypeUnwrapErrorExpr:
case NodeTypeDefer:
case NodeTypeSliceExpr:
case NodeTypeFieldAccessExpr: