Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

cgen,checker: fix map generic fn arg passing #22071

Merged
merged 9 commits into from
Aug 20, 2024
Merged

cgen,checker: fix map generic fn arg passing #22071

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
23162dc
fix
felipensp Aug 17, 2024
bd39418
Update vlib/v/gen/c/fn.v
felipensp Aug 19, 2024
51a24dd
remove duplicated code
felipensp Aug 19, 2024
9df7a4f
Merge branch 'fix_generic_map_part' of https://github.com/felipensp/v…
felipensp Aug 19, 2024
4849d53
improve
felipensp Aug 19, 2024
688987f
fix
felipensp Aug 19, 2024
0061f4b
fix
felipensp Aug 19, 2024
85ba5a2
fix
felipensp Aug 19, 2024
4b35e3a
remove fn position change
felipensp Aug 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 20 additions & 14 deletions vlib/v/checker/fn.v
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1698,22 +1698,21 @@ fn (mut c Checker) resolve_comptime_args(func ast.Fn, node_ ast.CallExpr, concre
mut ctyp := c.comptime.get_comptime_var_type(call_arg.expr)
if ctyp != ast.void_type {
arg_sym := c.table.sym(ctyp)
param_sym := c.table.final_sym(param_typ)
if arg_sym.info is ast.Array && param_typ.has_flag(.generic)
&& c.table.final_sym(param_typ).kind == .array {
&& param_sym.kind == .array {
ctyp = arg_sym.info.elem_type
} else if arg_sym.info is ast.Map && param_typ.has_flag(.generic)
&& c.table.final_sym(param_typ).kind == .map {
map_info := c.table.final_sym(param_typ).info as ast.Map
key_is_generic := map_info.key_type.has_flag(.generic)
if key_is_generic {
&& param_sym.info is ast.Map {
if param_sym.info.key_type.has_flag(.generic) {
ctyp = c.unwrap_generic(arg_sym.info.key_type)
}
if map_info.value_type.has_flag(.generic) {
if key_is_generic {
if param_sym.info.value_type.has_flag(.generic) {
comptime_args[k] = ctyp
k++
ctyp = c.unwrap_generic(arg_sym.info.key_type)
}
ctyp = c.unwrap_generic(arg_sym.info.key_type)
} else if param_sym.info.value_type.has_flag(.generic) {
ctyp = c.unwrap_generic(arg_sym.info.value_type)
}
}
comptime_args[k] = ctyp
Expand All @@ -1723,7 +1722,6 @@ fn (mut c Checker) resolve_comptime_args(func ast.Fn, node_ ast.CallExpr, concre
if ctyp != ast.void_type {
arg_sym := c.table.final_sym(call_arg.typ)
param_typ_sym := c.table.sym(param_typ)

if param_typ.has_flag(.variadic) {
ctyp = ast.mktyp(ctyp)
comptime_args[k] = ctyp
Expand Down Expand Up @@ -1756,11 +1754,19 @@ fn (mut c Checker) resolve_comptime_args(func ast.Fn, node_ ast.CallExpr, concre
cparam_type_sym := c.table.sym(c.unwrap_generic(ctyp))
if param_typ_sym.kind == .array && cparam_type_sym.info is ast.Array {
comptime_args[k] = cparam_type_sym.info.elem_type
} else if param_typ_sym.kind == .map
} else if param_typ_sym.info is ast.Map
&& cparam_type_sym.info is ast.Map {
comptime_args[k] = cparam_type_sym.info.key_type
comptime_args[k + 1] = cparam_type_sym.info.value_type
k++
key_is_generic := param_typ_sym.info.key_type.has_flag(.generic)
if key_is_generic {
comptime_args[k] = cparam_type_sym.info.key_type
}
if param_typ_sym.info.value_type.has_flag(.generic) {
k2 := if key_is_generic { k + 1 } else { k }
comptime_args[k2] = cparam_type_sym.info.value_type
if key_is_generic {
k++
}
}
felipensp marked this conversation as resolved.
Show resolved Hide resolved
} else {
if node_.args[i].expr.is_auto_deref_var() {
ctyp = ctyp.deref()
Expand Down
23 changes: 14 additions & 9 deletions vlib/v/gen/c/fn.v
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1343,11 +1343,17 @@ fn (mut g Gen) resolve_comptime_args(func ast.Fn, mut node_ ast.CallExpr, concre
cparam_type_sym := g.table.sym(g.unwrap_generic(ctyp))
if param_typ_sym.kind == .array && cparam_type_sym.info is ast.Array {
comptime_args[k] = cparam_type_sym.info.elem_type
} else if param_typ_sym.kind == .map
} else if param_typ_sym.info is ast.Map
&& cparam_type_sym.info is ast.Map {
comptime_args[k] = cparam_type_sym.info.key_type
comptime_args[k + 1] = cparam_type_sym.info.value_type
k++
if param_typ_sym.info.key_type.has_flag(.generic) {
comptime_args[k] = cparam_type_sym.info.key_type
if param_typ_sym.info.value_type.has_flag(.generic) {
k++
comptime_args[k] = cparam_type_sym.info.value_type
}
} else if param_typ_sym.info.value_type.has_flag(.generic) {
comptime_args[k] = cparam_type_sym.info.value_type
}
} else {
if node_.args[i].expr.is_auto_deref_var() {
ctyp = ctyp.deref()
Expand Down Expand Up @@ -1392,14 +1398,13 @@ fn (mut g Gen) resolve_comptime_args(func ast.Fn, mut node_ ast.CallExpr, concre
&& param_typ.has_flag(.generic) {
comptime_sym := g.table.sym(comptime_args[k])
if comptime_sym.info is ast.Map {
key_is_generic := param_sym.info.key_type.has_flag(.generic)
if key_is_generic {
if param_sym.info.key_type.has_flag(.generic) {
comptime_args[k] = comptime_sym.info.key_type
}
if param_sym.info.value_type.has_flag(.generic) {
if key_is_generic {
if param_sym.info.value_type.has_flag(.generic) {
k++
comptime_args[k] = comptime_sym.info.value_type
}
} else if param_sym.info.value_type.has_flag(.generic) {
comptime_args[k] = comptime_sym.info.value_type
}
}
Expand Down
19 changes: 19 additions & 0 deletions vlib/v/tests/comptime_map_part_generic_test.v
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
fn marshal[T](val T) string {
return marshal_map(val)
}

fn marshal_map[T](val map[string]T) string {
return typeof(val).name
}

fn test_main() {
assert marshal({
'a': 1
}) == 'map[string]int'
assert marshal({
'a': true
}) == 'map[string]bool'
assert marshal({
'a': 1.2
}) == 'map[string]f64'
}
Loading