mirror/v
1
0
Fork 0
mirror of https://github.com/vlang/v.git synced 2023-08-10 21:13:21 +03:00
Code Issues Projects Releases Wiki Activity

cgen: minor optimization and cleanup in match_expr_sumtype() (#16126)

Browse Source
This commit is contained in:
yuyi 2022-10-21 01:36:56 +08:00 committed by GitHub
parent a3b050aced
commit 0d368562f4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -140,13 +140,13 @@ fn (mut g Gen) match_expr(node ast.MatchExpr) {
fn (mut g Gen) match_expr_sumtype(node ast.MatchExpr, is_expr bool, cond_var string, tmp_var string) { fn (mut g Gen) match_expr_sumtype(node ast.MatchExpr, is_expr bool, cond_var string, tmp_var string) {
dot_or_ptr := if node.cond_type.is_ptr() { '->' } else { '.' } dot_or_ptr := if node.cond_type.is_ptr() { '->' } else { '.' }
use_ternary := is_expr && tmp_var.len == 0 use_ternary := is_expr && tmp_var.len == 0
cond_sym := g.table.sym(node.cond_type)
for j, branch in node.branches { for j, branch in node.branches {
mut sumtype_index := 0 mut sumtype_index := 0
// iterates through all types in sumtype branches // iterates through all types in sumtype branches
for { for {
g.aggregate_type_idx = sumtype_index g.aggregate_type_idx = sumtype_index
is_last := j == node.branches.len - 1 && sumtype_index == branch.exprs.len - 1 is_last := j == node.branches.len - 1 && sumtype_index == branch.exprs.len - 1
sym := g.table.sym(node.cond_type)
if branch.is_else || (use_ternary && is_last) { if branch.is_else || (use_ternary && is_last) {
if use_ternary { if use_ternary {
// TODO too many branches. maybe separate ?: matches // TODO too many branches. maybe separate ?: matches
@ -175,20 +175,19 @@ fn (mut g Gen) match_expr_sumtype(node ast.MatchExpr, is_expr bool, cond_var str
g.write('if (') g.write('if (')
} }
g.write(cond_var) g.write(cond_var)
be := unsafe { &branch.exprs[sumtype_index] } cur_expr := unsafe { &branch.exprs[sumtype_index] }
if sym.kind == .sum_type { if cond_sym.kind == .sum_type {
g.write('${dot_or_ptr}_typ == ') g.write('${dot_or_ptr}_typ == ')
if be is ast.None { if cur_expr is ast.None {
g.write('$ast.none_type.idx() /* none */') g.write('$ast.none_type.idx() /* none */')
} else { } else {
g.expr(be) g.expr(cur_expr)
} }
} else if sym.kind == .interface_ { } else if cond_sym.kind == .interface_ {
if be is ast.TypeNode { if cur_expr is ast.TypeNode {
typ := be as ast.TypeNode branch_sym := g.table.sym(g.unwrap_generic(cur_expr.typ))
branch_sym := g.table.sym(g.unwrap_generic(typ.typ)) g.write('${dot_or_ptr}_typ == _${cond_sym.cname}_${branch_sym.cname}_index')
g.write('${dot_or_ptr}_typ == _${sym.cname}_${branch_sym.cname}_index') } else if cur_expr is ast.None && cond_sym.idx == ast.error_type_idx {
} else if be is ast.None && sym.idx == ast.error_type_idx {
g.write('${dot_or_ptr}_typ == _IError_None___index') g.write('${dot_or_ptr}_typ == _IError_None___index')
} }
} }