Skip to content

Commit

Permalink
cgen: fix generic closure fn direct call (#16057)
Browse files Browse the repository at this point in the history
  • Loading branch information
yuyi98 committed Oct 13, 2022
1 parent e3e8bb2 commit f010832
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 1 deletion.
12 changes: 11 additions & 1 deletion vlib/v/gen/c/fn.v
Expand Up @@ -635,7 +635,17 @@ fn (mut g Gen) call_expr(node ast.CallExpr) {
// NOTE: everything could be done this way
// see my comment in parser near anon_fn
if node.left is ast.AnonFn {
g.expr(node.left)
if node.left.inherited_vars.len > 0 {
tmp_var := g.new_tmp_var()
fn_type := g.fn_var_signature(node.left.decl.return_type, node.left.decl.params.map(it.typ),
tmp_var)
g.write('$fn_type = ')
g.expr(node.left)
g.writeln(';')
g.write(tmp_var)
} else {
g.expr(node.left)
}
} else if node.left is ast.IndexExpr && node.name == '' {
g.is_fn_index_call = true
g.expr(node.left)
Expand Down
17 changes: 17 additions & 0 deletions vlib/v/tests/generics_closure_fn_direct_call_test.v
@@ -0,0 +1,17 @@
pub struct App {
}

pub fn (mut app App) register<T>(service T) {
fn [service] <T>() {
println(service)
}()
}

pub struct Service {
}

fn test_generics_closure_fn_direct_call() {
mut app := App{}
app.register(Service{})
assert true
}

0 comments on commit f010832

Please sign in to comment.