vieter-v
/
v
2
0
Fork 0
Code Issues Pull Requests Releases Activity

cgen: generate smaller switch statements for sumtypes/enums with else{}

pull/13777/head
Delyan Angelov 2022-03-19 20:55:32 +02:00
parent eb7c9cec3d
commit 02b889dac3
No known key found for this signature in database
GPG Key ID: 66886C0F12D595ED
2 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
vlib/v/gen/c/match.v
View File

@ -183,7 +183,6 @@ fn (mut g Gen) match_expr_sumtype(node ast.MatchExpr, is_expr bool, cond_var str
} }
fn (mut g Gen) match_expr_switch(node ast.MatchExpr, is_expr bool, cond_var string, tmp_var string, enum_typ ast.TypeSymbol) { fn (mut g Gen) match_expr_switch(node ast.MatchExpr, is_expr bool, cond_var string, tmp_var string, enum_typ ast.TypeSymbol) {
cname := '${enum_typ.cname}__'
mut covered_enum := []string{cap: (enum_typ.info as ast.Enum).vals.len} // collects missing enum variant branches to avoid cstrict errors mut covered_enum := []string{cap: (enum_typ.info as ast.Enum).vals.len} // collects missing enum variant branches to avoid cstrict errors
mut range_branches := []ast.MatchBranch{cap: node.branches.len} // branches have RangeExpr cannot emit as switch case branch, we handle it in default branch mut range_branches := []ast.MatchBranch{cap: node.branches.len} // branches have RangeExpr cannot emit as switch case branch, we handle it in default branch
mut default_generated := false mut default_generated := false
@ -192,11 +191,6 @@ fn (mut g Gen) match_expr_switch(node ast.MatchExpr, is_expr bool, cond_var stri
g.indent++ g.indent++
for branch in node.branches { for branch in node.branches {
if branch.is_else { if branch.is_else {
for val in (enum_typ.info as ast.Enum).vals {
if val !in covered_enum {
g.writeln('case $cname$val:')
}
}
g.writeln('default:') g.writeln('default:')
default_generated = true default_generated = true
if range_branches.len > 0 { if range_branches.len > 0 {
@ -233,7 +227,7 @@ fn (mut g Gen) match_expr_switch(node ast.MatchExpr, is_expr bool, cond_var stri
} }
g.writeln(') {') g.writeln(') {')
g.stmts_with_tmp_var(range_branch.stmts, tmp_var) g.stmts_with_tmp_var(range_branch.stmts, tmp_var)
g.writeln('break;') g.writeln('\tbreak;')
g.writeln('}') g.writeln('}')
} }
g.indent-- g.indent--
@ -259,7 +253,8 @@ fn (mut g Gen) match_expr_switch(node ast.MatchExpr, is_expr bool, cond_var stri
} }
g.stmts_with_tmp_var(branch.stmts, tmp_var) g.stmts_with_tmp_var(branch.stmts, tmp_var)
g.expected_cast_type = 0 g.expected_cast_type = 0
g.writeln('} break;') g.writeln('\tbreak;')
g.writeln('}')
g.indent-- g.indent--
} }
if range_branches.len > 0 && !default_generated { if range_branches.len > 0 && !default_generated {
@ -297,7 +292,7 @@ fn (mut g Gen) match_expr_switch(node ast.MatchExpr, is_expr bool, cond_var stri
} }
g.writeln(') {') g.writeln(') {')
g.stmts_with_tmp_var(range_branch.stmts, tmp_var) g.stmts_with_tmp_var(range_branch.stmts, tmp_var)
g.writeln('break;') g.writeln('\tbreak;')
g.writeln('}') g.writeln('}')
} }
g.indent-- g.indent--

1
vlib/v/gen/c/testdata/enum_switch_case.c.must_have vendored
View File

@ -1,5 +1,4 @@
case main__Enum__e1: case main__Enum__e1:
case main__Enum__e4: case main__Enum__e4:
case main__Enum__e6:
default: default:
(e >= 4 && e <= 5) (e >= 4 && e <= 5)