vieter-v
/
v
2
0
Fork 0
Code Issues Pull Requests Releases Activity

checker: minor cleanup of checker.v (#9585)

pull/9580/head
yuyi 2021-04-04 22:05:29 +08:00 committed by GitHub
parent c698fa1a58
commit 8dd4a63913
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
vlib/v/checker/checker.v
View File

@ -1286,7 +1286,7 @@ fn (mut c Checker) fail_if_immutable(expr ast.Expr) (string, token.Position) {
pub fn (mut c Checker) call_expr(mut call_expr ast.CallExpr) ast.Type { pub fn (mut c Checker) call_expr(mut call_expr ast.CallExpr) ast.Type {
// First check everything that applies to both fns and methods // First check everything that applies to both fns and methods
// TODO merge logic from call_method and call_fn // TODO merge logic from method_call and fn_call
/* /*
for i, call_arg in call_expr.args { for i, call_arg in call_expr.args {
if call_arg.is_mut { if call_arg.is_mut {
@ -1307,8 +1307,8 @@ pub fn (mut c Checker) call_expr(mut call_expr ast.CallExpr) ast.Type {
} }
} }
*/ */
// Now call `call_method` or `call_fn` for specific checks. // Now call `method_call` or `fn_call` for specific checks.
typ := if call_expr.is_method { c.call_method(mut call_expr) } else { c.call_fn(mut call_expr) } typ := if call_expr.is_method { c.method_call(mut call_expr) } else { c.fn_call(mut call_expr) }
// autofree: mark args that have to be freed (after saving them in tmp exprs) // autofree: mark args that have to be freed (after saving them in tmp exprs)
free_tmp_arg_vars := c.pref.autofree && !c.is_builtin_mod && call_expr.args.len > 0 free_tmp_arg_vars := c.pref.autofree && !c.is_builtin_mod && call_expr.args.len > 0
&& !call_expr.args[0].typ.has_flag(.optional) && !call_expr.args[0].typ.has_flag(.optional)
@ -1420,7 +1420,7 @@ fn (mut c Checker) check_map_and_filter(is_map bool, elem_typ ast.Type, call_exp
} }
} }
pub fn (mut c Checker) call_method(mut call_expr ast.CallExpr) ast.Type { pub fn (mut c Checker) method_call(mut call_expr ast.CallExpr) ast.Type {
left_type := c.expr(call_expr.left) left_type := c.expr(call_expr.left)
c.expected_type = left_type c.expected_type = left_type
is_generic := left_type.has_flag(.generic) is_generic := left_type.has_flag(.generic)
@ -1460,9 +1460,9 @@ pub fn (mut c Checker) call_method(mut call_expr ast.CallExpr) ast.Type {
// TODO: remove this for actual methods, use only for compiler magic // TODO: remove this for actual methods, use only for compiler magic
// FIXME: Argument count != 1 will break these // FIXME: Argument count != 1 will break these
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.array_builtin_method_call(mut call_expr, left_type, left_type_sym)
} else if left_type_sym.kind == .map && method_name in ['clone', 'keys', 'move', 'delete_1'] { } else if left_type_sym.kind == .map && method_name in ['clone', 'keys', 'move', 'delete_1'] {
return c.call_map_builtin_method(mut call_expr, left_type, left_type_sym) return c.map_builtin_method_call(mut call_expr, left_type, left_type_sym)
} 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 ast.Array info := left_type_sym.info as ast.Array
arg_expr := if method_name == 'insert' { arg_expr := if method_name == 'insert' {
@ -1723,7 +1723,7 @@ pub fn (mut c Checker) call_method(mut call_expr ast.CallExpr) ast.Type {
return ast.void_type return ast.void_type
} }
fn (mut c Checker) call_map_builtin_method(mut call_expr ast.CallExpr, left_type ast.Type, left_type_sym ast.TypeSymbol) ast.Type { fn (mut c Checker) map_builtin_method_call(mut call_expr ast.CallExpr, left_type ast.Type, left_type_sym ast.TypeSymbol) ast.Type {
method_name := call_expr.name method_name := call_expr.name
mut ret_type := ast.void_type mut ret_type := ast.void_type
match method_name { match method_name {
@ -1749,7 +1749,7 @@ fn (mut c Checker) call_map_builtin_method(mut call_expr ast.CallExpr, left_type
return call_expr.return_type return call_expr.return_type
} }
fn (mut c Checker) call_array_builtin_method(mut call_expr ast.CallExpr, left_type ast.Type, left_type_sym ast.TypeSymbol) ast.Type { fn (mut c Checker) array_builtin_method_call(mut call_expr ast.CallExpr, left_type ast.Type, left_type_sym ast.TypeSymbol) ast.Type {
method_name := call_expr.name method_name := call_expr.name
mut elem_typ := ast.void_type mut elem_typ := ast.void_type
if method_name == 'slice' && !c.is_builtin_mod { if method_name == 'slice' && !c.is_builtin_mod {
@ -1849,7 +1849,7 @@ fn (mut c Checker) call_array_builtin_method(mut call_expr ast.CallExpr, left_ty
return call_expr.return_type return call_expr.return_type
} }
pub fn (mut c Checker) call_fn(mut call_expr ast.CallExpr) ast.Type { pub fn (mut c Checker) fn_call(mut call_expr ast.CallExpr) ast.Type {
fn_name := call_expr.name fn_name := call_expr.name
if fn_name == 'main' { if fn_name == 'main' {
c.error('the `main` function cannot be called in the program', call_expr.pos) c.error('the `main` function cannot be called in the program', call_expr.pos)