authorgravatar for liljaanton2001@gmail.comantlilja <liljaanton2001@gmail.com> 2020-06-23 15:18:28+02:00
committergravatar for liljaanton2001@gmail.comantlilja <liljaanton2001@gmail.com> 2020-06-24 17:36:24+02:00
logfd50696359ec86abd238993930e979433a31db9a
tree6ed87ae39c4ca488ce5355b5d5f91d14f7bf309a
parent5229f6ec68708c3e66393a50ad9f9032ee7f4257

Store else node in IrInstSrcCheckSwitchProngs

* Remove have_else_prong (bool) * Add else_prong (AstNode*)

3 files changed, 10 insertions(+), 10 deletions(-)

src/all_types.hpp+1-1
......@@ -4095,7 +4095,7 @@ struct IrInstSrcCheckSwitchProngs {
40954095 IrInstSrc *target_value;
40964096 IrInstSrcCheckSwitchProngsRange *ranges;
40974097 size_t range_count;
4098 bool have_else_prong;
4098 AstNode* else_prong;
40994099 bool have_underscore_prong;
41004100};
41014101
src/ir.cpp+8-8
......@@ -4274,14 +4274,14 @@ static IrInstGen *ir_build_err_to_int_gen(IrAnalyze *ira, Scope *scope, AstNode
42744274
42754275static IrInstSrc *ir_build_check_switch_prongs(IrBuilderSrc *irb, Scope *scope, AstNode *source_node,
42764276 IrInstSrc *target_value, IrInstSrcCheckSwitchProngsRange *ranges, size_t range_count,
4277 bool have_else_prong, bool have_underscore_prong)
4277 AstNode* else_prong, bool have_underscore_prong)
42784278{
42794279 IrInstSrcCheckSwitchProngs *instruction = ir_build_instruction<IrInstSrcCheckSwitchProngs>(
42804280 irb, scope, source_node);
42814281 instruction->target_value = target_value;
42824282 instruction->ranges = ranges;
42834283 instruction->range_count = range_count;
4284 instruction->have_else_prong = have_else_prong;
4284 instruction->else_prong = else_prong;
42854285 instruction->have_underscore_prong = have_underscore_prong;
42864286
42874287 ir_ref_instruction(target_value, irb->current_basic_block);
......@@ -9305,7 +9305,7 @@ static IrInstSrc *ir_gen_switch_expr(IrBuilderSrc *irb, Scope *scope, AstNode *n
93059305 }
93069306
93079307 IrInstSrc *switch_prongs_void = ir_build_check_switch_prongs(irb, scope, node, target_value,
9308 check_ranges.items, check_ranges.length, else_prong != nullptr, underscore_prong != nullptr);
9308 check_ranges.items, check_ranges.length, else_prong, underscore_prong != nullptr);
93099309
93109310 IrInstSrc *br_instruction;
93119311 if (cases.length == 0) {
......@@ -28685,7 +28685,7 @@ static IrInstGen *ir_analyze_instruction_check_switch_prongs(IrAnalyze *ira,
2868528685 buf_ptr(enum_field->name)));
2868628686 }
2868728687 }
28688 } else if (!instruction->have_else_prong) {
28688 } else if (instruction->else_prong == nullptr) {
2868928689 if (switch_type->data.enumeration.non_exhaustive) {
2869028690 ir_add_error(ira, &instruction->base.base,
2869128691 buf_sprintf("switch on non-exhaustive enum must include `else` or `_` prong"));
......@@ -28746,7 +28746,7 @@ static IrInstGen *ir_analyze_instruction_check_switch_prongs(IrAnalyze *ira,
2874628746 }
2874728747 field_prev_uses[start_index] = start_value->base.source_node;
2874828748 }
28749 if (!instruction->have_else_prong) {
28749 if (instruction->else_prong == nullptr) {
2875028750 if (type_is_global_error_set(switch_type)) {
2875128751 ir_add_error(ira, &instruction->base.base,
2875228752 buf_sprintf("else prong required when switching on type 'anyerror'"));
......@@ -28808,7 +28808,7 @@ static IrInstGen *ir_analyze_instruction_check_switch_prongs(IrAnalyze *ira,
2880828808 return ira->codegen->invalid_inst_gen;
2880928809 }
2881028810 }
28811 if (!instruction->have_else_prong) {
28811 if (instruction->else_prong == nullptr) {
2881228812 BigInt min_val;
2881328813 eval_min_max_value_int(ira->codegen, switch_type, &min_val, false);
2881428814 BigInt max_val;
......@@ -28847,11 +28847,11 @@ static IrInstGen *ir_analyze_instruction_check_switch_prongs(IrAnalyze *ira,
2884728847 return ira->codegen->invalid_inst_gen;
2884828848 }
2884928849 }
28850 if (((seenTrue < 1) || (seenFalse < 1)) && !instruction->have_else_prong) {
28850 if (((seenTrue < 1) || (seenFalse < 1)) && instruction->else_prong == nullptr) {
2885128851 ir_add_error(ira, &instruction->base.base, buf_sprintf("switch must handle all possibilities"));
2885228852 return ira->codegen->invalid_inst_gen;
2885328853 }
28854 } else if (!instruction->have_else_prong) {
28854 } else if (instruction->else_prong == nullptr) {
2885528855 ir_add_error(ira, &instruction->base.base,
2885628856 buf_sprintf("else prong required when switching on type '%s'", buf_ptr(&switch_type->name)));
2885728857 return ira->codegen->invalid_inst_gen;
src/ir_print.cpp+1-1
......@@ -2177,7 +2177,7 @@ static void ir_print_check_switch_prongs(IrPrintSrc *irp, IrInstSrcCheckSwitchPr
21772177 fprintf(irp->f, "...");
21782178 ir_print_other_inst_src(irp, instruction->ranges[i].end);
21792179 }
2180 const char *have_else_str = instruction->have_else_prong ? "yes" : "no";
2180 const char *have_else_str = instruction->else_prong != nullptr ? "yes" : "no";
21812181 fprintf(irp->f, ")else:%s", have_else_str);
21822182}
21832183