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: cleanup call_method (#9365)

Browse Source
This commit is contained in:
zakuro 2021-03-19 21:19:38 +09:00 committed by GitHub
parent 4f6306f6d4
commit 95a748e8b0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 35 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
vlib/v/checker/checker.v
View File

@ -26,7 +26,7 @@ const (
valid_comp_if_platforms = ['amd64', 'aarch64', 'x64', 'x32', 'little_endian', 'big_endian'] valid_comp_if_platforms = ['amd64', 'aarch64', 'x64', 'x32', 'little_endian', 'big_endian']
valid_comp_if_other = ['js', 'debug', 'prod', 'test', 'glibc', 'prealloc', 'no_bounds_checking'] valid_comp_if_other = ['js', 'debug', 'prod', 'test', 'glibc', 'prealloc', 'no_bounds_checking']
array_builtin_methods = ['filter', 'clone', 'repeat', 'reverse', 'map', 'slice', 'sort', array_builtin_methods = ['filter', 'clone', 'repeat', 'reverse', 'map', 'slice', 'sort',
'contains', 'index', 'wait', 'any', 'all'] 'contains', 'index', 'wait', 'any', 'all', 'first', 'last', 'pop']
) )
pub struct Checker { pub struct Checker {
@ -1388,37 +1388,7 @@ pub fn (mut c Checker) call_method(mut call_expr ast.CallExpr) table.Type {
if left_type_sym.kind == .array && method_name in checker.array_builtin_methods { if left_type_sym.kind == .array && method_name in checker.array_builtin_methods {
return c.call_array_builtin_method(mut call_expr, left_type, left_type_sym) return c.call_array_builtin_method(mut call_expr, left_type, left_type_sym)
} else if left_type_sym.kind == .map && method_name in ['clone', 'keys', 'move'] { } else if left_type_sym.kind == .map && method_name in ['clone', 'keys', 'move'] {
mut ret_type := table.void_type return c.call_map_builtin_method(mut call_expr, left_type, left_type_sym)
match method_name {
'clone', 'move' {
if method_name[0] == `m` {
c.fail_if_immutable(call_expr.left)
}
if call_expr.left.is_auto_deref_var() {
ret_type = left_type.deref()
} else {
ret_type = left_type
}
}
'keys' {
info := left_type_sym.info as table.Map
typ := c.table.find_or_register_array(info.key_type)
ret_type = table.Type(typ)
}
else {}
}
call_expr.receiver_type = left_type.to_ptr()
call_expr.return_type = ret_type
return call_expr.return_type
} else if left_type_sym.kind == .array && method_name in ['first', 'last', 'pop'] {
info := left_type_sym.info as table.Array
call_expr.return_type = info.elem_type
if method_name == 'pop' {
call_expr.receiver_type = left_type.to_ptr()
} else {
call_expr.receiver_type = left_type
}
return call_expr.return_type
} else if left_type_sym.kind == .array && method_name in ['insert', 'prepend'] { } else if left_type_sym.kind == .array && method_name in ['insert', 'prepend'] {
info := left_type_sym.info as table.Array info := left_type_sym.info as table.Array
arg_expr := if method_name == 'insert' { arg_expr := if method_name == 'insert' {
@ -1679,6 +1649,32 @@ pub fn (mut c Checker) call_method(mut call_expr ast.CallExpr) table.Type {
return table.void_type return table.void_type
} }
fn (mut c Checker) call_map_builtin_method(mut call_expr ast.CallExpr, left_type table.Type, left_type_sym table.TypeSymbol) table.Type {
method_name := call_expr.name
mut ret_type := table.void_type
match method_name {
'clone', 'move' {
if method_name[0] == `m` {
c.fail_if_immutable(call_expr.left)
}
if call_expr.left.is_auto_deref_var() {
ret_type = left_type.deref()
} else {
ret_type = left_type
}
}
'keys' {
info := left_type_sym.info as table.Map
typ := c.table.find_or_register_array(info.key_type)
ret_type = table.Type(typ)
}
else {}
}
call_expr.receiver_type = left_type.to_ptr()
call_expr.return_type = ret_type
return call_expr.return_type
}
fn (mut c Checker) call_array_builtin_method(mut call_expr ast.CallExpr, left_type table.Type, left_type_sym table.TypeSymbol) table.Type { fn (mut c Checker) call_array_builtin_method(mut call_expr ast.CallExpr, left_type table.Type, left_type_sym table.TypeSymbol) table.Type {
method_name := call_expr.name method_name := call_expr.name
mut elem_typ := table.void_type mut elem_typ := table.void_type
@ -1768,6 +1764,13 @@ fn (mut c Checker) call_array_builtin_method(mut call_expr ast.CallExpr, left_ty
call_expr.return_type = table.bool_type call_expr.return_type = table.bool_type
} else if method_name == 'index' { } else if method_name == 'index' {
call_expr.return_type = table.int_type call_expr.return_type = table.int_type
} else if method_name in ['first', 'last', 'pop'] {
call_expr.return_type = array_info.elem_type
if method_name == 'pop' {
call_expr.receiver_type = left_type.to_ptr()
} else {
call_expr.receiver_type = left_type
}
} }
return call_expr.return_type return call_expr.return_type
} }