fix

felipensp · Sep 22, 2024 · 003fbff · 003fbff
1 parent 7203317
commit 003fbff
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/vlib/v/gen/c/assign.v b/vlib/v/gen/c/assign.v
@@ -589,7 +589,7 @@ fn (mut g Gen) assign_stmt(node_ ast.AssignStmt) {
 				}
 				fn_name := c_fn_name(g.get_ternary_name(ident.name))
 
-				if val_type.has_flag(.option) && val in [ast.CastExpr, ast.SelectorExpr] {
+				if val_type.has_flag(.option) {
 					ret_styp := g.typ(g.unwrap_generic(val_type))
 					g.write('${ret_styp} ${fn_name}')
 				} else {

diff --git a/vlib/v/tests/options/option_fntype_assign_test.v b/vlib/v/tests/options/option_fntype_assign_test.v
@@ -9,8 +9,16 @@ fn find_func(name string) ?DataFn {
 	return a
 }
 
+fn find_func2(name string) ?DataFn {
+	a := if name == 'vlang' { ?DataFn(which_lang) } else { none }
+	return a
+}
+
 fn test_main() {
 	if a := find_func('foo') {
 		assert a('bar') == 'bar'
 	}
+	if b := find_func('foo') {
+		assert b('bar') == 'bar'
+	}
 }