authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2016-02-04 17:21:08-07:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2016-02-04 17:21:08-07:00
log093e0d1bb020e6b7245d142b1fc75bdbd7868045
tree1ec1d75ae181952ab99c69808210ced4405f9c09
parenta4cba900e53154abd5595bacf709fe8fdcc86b27

support variable in switch expression prongs

See #43

4 files changed, 105 insertions(+), 36 deletions(-)

src/all_types.hpp+1
......@@ -510,6 +510,7 @@ struct AstNodeSwitchProng {
510510 // populated by semantic analyzer
511511 BlockContext *block_context;
512512 VariableTableEntry *var;
513 bool var_is_target_expr;
513514};
514515
515516struct AstNodeSwitchRange {
src/analyze.cpp+18-1
......@@ -4495,6 +4495,7 @@ static TypeTableEntry *analyze_switch_expr(CodeGen *g, ImportTableEntry *import,
44954495 AstNode *prong_node = node->data.switch_expr.prongs.at(prong_i);
44964496
44974497 TypeTableEntry *var_type;
4498 bool var_is_target_expr;
44984499 if (prong_node->data.switch_prong.items.length == 0) {
44994500 if (else_prong) {
45004501 add_node_error(g, prong_node, buf_sprintf("multiple else prongs in switch expression"));
......@@ -4502,7 +4503,11 @@ static TypeTableEntry *analyze_switch_expr(CodeGen *g, ImportTableEntry *import,
45024503 else_prong = prong_node;
45034504 }
45044505 var_type = expr_type;
4506 var_is_target_expr = true;
45054507 } else {
4508 bool all_agree_on_var_type = true;
4509 var_type = nullptr;
4510
45064511 for (int item_i = 0; item_i < prong_node->data.switch_prong.items.length; item_i += 1) {
45074512 AstNode *item_node = prong_node->data.switch_prong.items.at(item_i);
45084513 if (item_node->type == NodeTypeSwitchRange) {
......@@ -4515,6 +4520,12 @@ static TypeTableEntry *analyze_switch_expr(CodeGen *g, ImportTableEntry *import,
45154520 TypeEnumField *type_enum_field = get_enum_field(expr_type, field_name);
45164521 if (type_enum_field) {
45174522 item_node->data.symbol_expr.enum_field = type_enum_field;
4523 if (!var_type) {
4524 var_type = type_enum_field->type_entry;
4525 }
4526 if (type_enum_field->type_entry != var_type) {
4527 all_agree_on_var_type = false;
4528 }
45184529 } else {
45194530 add_node_error(g, item_node,
45204531 buf_sprintf("enum '%s' has no field '%s'",
......@@ -4534,7 +4545,12 @@ static TypeTableEntry *analyze_switch_expr(CodeGen *g, ImportTableEntry *import,
45344545 }
45354546 }
45364547 }
4537 var_type = expr_type;
4548 if (!var_type || !all_agree_on_var_type) {
4549 var_type = expr_type;
4550 var_is_target_expr = true;
4551 } else {
4552 var_is_target_expr = false;
4553 }
45384554 }
45394555
45404556 BlockContext *child_context = new_block_context(node, context);
......@@ -4546,6 +4562,7 @@ static TypeTableEntry *analyze_switch_expr(CodeGen *g, ImportTableEntry *import,
45464562 var_node->block_context = child_context;
45474563 prong_node->data.switch_prong.var = add_local_var(g, var_node, child_context, var_name,
45484564 var_type, true);
4565 prong_node->data.switch_prong.var_is_target_expr = var_is_target_expr;
45494566 }
45504567
45514568 peer_types[prong_i] = analyze_expression(g, import, child_context, expected_type,
src/codegen.cpp+60-35
......@@ -184,6 +184,15 @@ static LLVMValueRef get_int_overflow_fn(CodeGen *g, TypeTableEntry *type_entry,
184184 return *fn;
185185}
186186
187static LLVMValueRef get_handle_value(CodeGen *g, AstNode *source_node, LLVMValueRef ptr, TypeTableEntry *type) {
188 if (handle_is_ptr(type)) {
189 return ptr;
190 } else {
191 add_debug_source_node(g, source_node);
192 return LLVMBuildLoad(g->builder, ptr, "");
193 }
194}
195
187196static LLVMValueRef gen_builtin_fn_call_expr(CodeGen *g, AstNode *node) {
188197 assert(node->type == NodeTypeFnCallExpr);
189198 AstNode *fn_ref_expr = node->data.fn_call_expr.fn_ref_expr;
......@@ -1024,11 +1033,7 @@ static LLVMValueRef gen_prefix_op_expr(CodeGen *g, AstNode *node) {
10241033
10251034 if (type_has_bits(child_type)) {
10261035 LLVMValueRef child_val_ptr = LLVMBuildStructGEP(g->builder, expr_val, 1, "");
1027 if (handle_is_ptr(child_type)) {
1028 return child_val_ptr;
1029 } else {
1030 return LLVMBuildLoad(g->builder, child_val_ptr, "");
1031 }
1036 return get_handle_value(g, expr_node, child_val_ptr, child_type);
10321037 } else {
10331038 return nullptr;
10341039 }
......@@ -1073,11 +1078,7 @@ static LLVMValueRef gen_prefix_op_expr(CodeGen *g, AstNode *node) {
10731078 } else {
10741079 add_debug_source_node(g, node);
10751080 LLVMValueRef maybe_field_ptr = LLVMBuildStructGEP(g->builder, expr_val, 0, "");
1076 if (handle_is_ptr(child_type)) {
1077 return maybe_field_ptr;
1078 } else {
1079 return LLVMBuildLoad(g->builder, maybe_field_ptr, "");
1080 }
1081 return get_handle_value(g, node, maybe_field_ptr, child_type);
10811082 }
10821083 }
10831084 }
......@@ -1412,11 +1413,7 @@ static LLVMValueRef gen_unwrap_maybe(CodeGen *g, AstNode *node, LLVMValueRef may
14121413 } else {
14131414 add_debug_source_node(g, node);
14141415 LLVMValueRef maybe_field_ptr = LLVMBuildStructGEP(g->builder, maybe_struct_ref, 0, "");
1415 if (handle_is_ptr(child_type)) {
1416 return maybe_field_ptr;
1417 } else {
1418 return LLVMBuildLoad(g->builder, maybe_field_ptr, "");
1419 }
1416 return get_handle_value(g, node, maybe_field_ptr, child_type);
14201417 }
14211418}
14221419
......@@ -1580,12 +1577,7 @@ static LLVMValueRef gen_unwrap_err_expr(CodeGen *g, AstNode *node) {
15801577 return nullptr;
15811578 }
15821579 LLVMValueRef child_val_ptr = LLVMBuildStructGEP(g->builder, expr_val, 1, "");
1583 LLVMValueRef child_val;
1584 if (handle_is_ptr(child_type)) {
1585 child_val = child_val_ptr;
1586 } else {
1587 child_val = LLVMBuildLoad(g->builder, child_val_ptr, "");
1588 }
1580 LLVMValueRef child_val = get_handle_value(g, node, child_val_ptr, child_type);
15891581
15901582 if (!have_end_block) {
15911583 return child_val;
......@@ -1667,11 +1659,7 @@ static LLVMValueRef gen_return_expr(CodeGen *g, AstNode *node) {
16671659 if (type_has_bits(child_type)) {
16681660 add_debug_source_node(g, node);
16691661 LLVMValueRef val_ptr = LLVMBuildStructGEP(g->builder, value, 1, "");
1670 if (handle_is_ptr(child_type)) {
1671 return val_ptr;
1672 } else {
1673 return LLVMBuildLoad(g->builder, val_ptr, "");
1674 }
1662 return get_handle_value(g, node, val_ptr, child_type);
16751663 } else {
16761664 return nullptr;
16771665 }
......@@ -2294,12 +2282,7 @@ static LLVMValueRef gen_symbol(CodeGen *g, AstNode *node) {
22942282 return nullptr;
22952283 } else if (variable->is_ptr) {
22962284 assert(variable->value_ref);
2297 if (handle_is_ptr(variable->type)) {
2298 return variable->value_ref;
2299 } else {
2300 add_debug_source_node(g, node);
2301 return LLVMBuildLoad(g->builder, variable->value_ref, "");
2302 }
2285 return get_handle_value(g, node, variable->value_ref, variable->type);
23032286 } else {
23042287 return variable->value_ref;
23052288 }
......@@ -2347,6 +2330,8 @@ static LLVMValueRef gen_switch_expr(CodeGen *g, AstNode *node) {
23472330 AstNode *else_prong = nullptr;
23482331 for (int prong_i = 0; prong_i < prong_count; prong_i += 1) {
23492332 AstNode *prong_node = node->data.switch_expr.prongs.at(prong_i);
2333 VariableTableEntry *prong_var = prong_node->data.switch_prong.var;
2334
23502335 LLVMBasicBlockRef prong_block;
23512336 if (prong_node->data.switch_prong.items.length == 0) {
23522337 assert(!else_prong);
......@@ -2354,8 +2339,12 @@ static LLVMValueRef gen_switch_expr(CodeGen *g, AstNode *node) {
23542339 prong_block = else_block;
23552340 } else {
23562341 prong_block = LLVMAppendBasicBlock(g->cur_fn->fn_value, "SwitchProng");
2357 for (int item_i = 0; item_i < prong_node->data.switch_prong.items.length; item_i += 1) {
2342 int prong_item_count = prong_node->data.switch_prong.items.length;
2343 bool make_item_blocks = prong_var && prong_item_count > 1;
2344
2345 for (int item_i = 0; item_i < prong_item_count; item_i += 1) {
23582346 AstNode *item_node = prong_node->data.switch_prong.items.at(item_i);
2347
23592348 assert(item_node->type != NodeTypeSwitchRange);
23602349 LLVMValueRef val;
23612350 if (target_type->id == TypeTableEntryIdEnum) {
......@@ -2364,14 +2353,50 @@ static LLVMValueRef gen_switch_expr(CodeGen *g, AstNode *node) {
23642353 assert(enum_field);
23652354 val = LLVMConstInt(target_type->data.enumeration.tag_type->type_ref,
23662355 enum_field->value, false);
2356
2357 if (prong_var && type_has_bits(prong_var->type)) {
2358 LLVMBasicBlockRef item_block;
2359
2360 if (make_item_blocks) {
2361 item_block = LLVMAppendBasicBlock(g->cur_fn->fn_value, "SwitchProngItem");
2362 LLVMAddCase(switch_instr, val, item_block);
2363 LLVMPositionBuilderAtEnd(g->builder, item_block);
2364 } else {
2365 LLVMAddCase(switch_instr, val, prong_block);
2366 LLVMPositionBuilderAtEnd(g->builder, prong_block);
2367 }
2368
2369 AstNode *var_node = prong_node->data.switch_prong.var_symbol;
2370 add_debug_source_node(g, var_node);
2371 if (prong_node->data.switch_prong.var_is_target_expr) {
2372 gen_assign_raw(g, var_node, BinOpTypeAssign,
2373 prong_var->value_ref, target_value, prong_var->type, target_type);
2374 } else if (target_type->id == TypeTableEntryIdEnum) {
2375 assert(type_has_bits(enum_field->type_entry));
2376 LLVMValueRef union_field_ptr = LLVMBuildStructGEP(g->builder, target_value_handle,
2377 1, "");
2378 LLVMValueRef bitcasted_union_field_ptr = LLVMBuildBitCast(g->builder, union_field_ptr,
2379 LLVMPointerType(enum_field->type_entry->type_ref, 0), "");
2380 LLVMValueRef handle_val = get_handle_value(g, var_node, bitcasted_union_field_ptr,
2381 enum_field->type_entry);
2382
2383 gen_assign_raw(g, var_node, BinOpTypeAssign,
2384 prong_var->value_ref, handle_val, prong_var->type, enum_field->type_entry);
2385 }
2386 if (make_item_blocks) {
2387 LLVMBuildBr(g->builder, prong_block);
2388 }
2389 } else {
2390 LLVMAddCase(switch_instr, val, prong_block);
2391 }
23672392 } else {
23682393 assert(get_resolved_expr(item_node)->const_val.ok);
23692394 val = gen_expr(g, item_node);
2395 LLVMAddCase(switch_instr, val, prong_block);
23702396 }
2371 LLVMAddCase(switch_instr, val, prong_block);
23722397 }
23732398 }
2374 assert(!prong_node->data.switch_prong.var_symbol);
2399
23752400 LLVMPositionBuilderAtEnd(g->builder, prong_block);
23762401 AstNode *prong_expr = prong_node->data.switch_prong.expr;
23772402 LLVMValueRef prong_val = gen_expr(g, prong_expr);
test/self_hosted.zig+26
......@@ -147,3 +147,29 @@ enum SwitchStatmentFoo {
147147 C,
148148 D,
149149}
150
151
152#attribute("test")
153fn switch_prong_with_var() {
154 switch_prong_with_var_fn(SwitchProngWithVarEnum.One(13));
155 switch_prong_with_var_fn(SwitchProngWithVarEnum.Two(13.0));
156 switch_prong_with_var_fn(SwitchProngWithVarEnum.Meh);
157}
158enum SwitchProngWithVarEnum {
159 One: i32,
160 Two: f32,
161 Meh,
162}
163fn switch_prong_with_var_fn(a: SwitchProngWithVarEnum) {
164 switch(a) {
165 One => |x| {
166 if (x != 13) unreachable{};
167 },
168 Two => |x| {
169 if (x != 13.0) unreachable{};
170 },
171 Meh => |x| {
172 const v: void = x;
173 },
174 }
175}