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

checker, cgen: fix alias of map keys() (#12422)

Browse Source
This commit is contained in:
yuyi 2021-11-10 19:04:59 +08:00 committed by GitHub
parent 194b3647e2
commit d5e767f389
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
vlib/v/checker/checker.v
View File

@ -1963,8 +1963,15 @@ pub fn (mut c Checker) method_call(mut node ast.CallExpr) ast.Type {
// FIXME: Argument count != 1 will break these
if left_type_sym.kind == .array && method_name in checker.array_builtin_methods {
return c.array_builtin_method_call(mut node, left_type, left_type_sym)
} else if left_type_sym.kind == .map && method_name in ['clone', 'keys', 'move', 'delete'] {
return c.map_builtin_method_call(mut node, left_type, left_type_sym)
} else if (left_type_sym.kind == .map || c.table.get_final_type_symbol(left_type).kind == .map)
&& method_name in ['clone', 'keys', 'move', 'delete'] {
if left_type_sym.kind == .map {
return c.map_builtin_method_call(mut node, left_type, left_type_sym)
} else {
parent_type := (left_type_sym.info as ast.Alias).parent_type
parent_sym := c.table.get_type_symbol(parent_type)
return c.map_builtin_method_call(mut node, parent_type, parent_sym)
}
} else if left_type_sym.kind == .array && method_name in ['insert', 'prepend'] {
if method_name == 'insert' {
if node.args.len != 2 {

2
vlib/v/gen/c/fn.v
View File

@ -853,7 +853,7 @@ fn (mut g Gen) method_call(node ast.CallExpr) {
if node.name in ['close', 'try_pop', 'try_push'] {
name = 'sync__Channel_$node.name'
}
} else if left_sym.kind == .map {
} else if final_left_sym.kind == .map {
if node.name == 'keys' {
name = 'map_keys'
}

12
vlib/v/tests/alias_map_keys_test.v Normal file
View File

@ -0,0 +1,12 @@
type Foo = map[string]string
fn test_alias_map_keys() {
keys_list := Foo({
'foo1': 'bar1'
'foo2': 'bar2'
'foo3': 'bar3'
}).keys()
println(keys_list)
assert keys_list == ['foo1', 'foo2', 'foo3']
}