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

v.checker: improve C.printf(abc) deprecation precision

pull/10182/head
Delyan Angelov 2021-05-23 12:18:21 +03:00
parent ae9f8627fc
commit a08cbd364a
No known key found for this signature in database
GPG Key ID: 66886C0F12D595ED
2 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
vlib/v/ast/types.v
View File

@ -411,6 +411,9 @@ pub const (
error_type = new_type(error_type_idx) error_type = new_type(error_type_idx)
charptr_types = [charptr_type, new_type(char_type_idx).set_nr_muls(1)] charptr_types = [charptr_type, new_type(char_type_idx).set_nr_muls(1)]
byteptr_types = [byteptr_type, new_type(byte_type_idx).set_nr_muls(1)] byteptr_types = [byteptr_type, new_type(byte_type_idx).set_nr_muls(1)]
cptr_or_bptr_types = [charptr_type, byteptr_type, new_type(char_type_idx).set_nr_muls(1),
new_type(byte_type_idx).set_nr_muls(1),
]
) )
pub const ( pub const (

21
vlib/v/checker/checker.v
View File

@ -67,6 +67,7 @@ pub mut:
inside_anon_fn bool inside_anon_fn bool
inside_ref_lit bool inside_ref_lit bool
inside_fn_arg bool // `a`, `b` in `a.f(b)` inside_fn_arg bool // `a`, `b` in `a.f(b)`
inside_c_call bool // true inside C.printf( param ) calls, but NOT in nested calls, unless they are also C.
skip_flags bool // should `#flag` and `#include` be skipped skip_flags bool // should `#flag` and `#include` be skipped
mut: mut:
files []ast.File files []ast.File
@ -90,7 +91,6 @@ mut:
inside_println_arg bool inside_println_arg bool
inside_decl_rhs bool inside_decl_rhs bool
need_recheck_generic_fns bool // need recheck generic fns because there are cascaded nested generic fn need_recheck_generic_fns bool // need recheck generic fns because there are cascaded nested generic fn
is_c_call bool // remove once C.c_call("string") deprecation is removed
} }
pub fn new_checker(table &ast.Table, pref &pref.Preferences) &Checker { pub fn new_checker(table &ast.Table, pref &pref.Preferences) &Checker {
@ -1694,6 +1694,11 @@ fn (mut c Checker) check_map_and_filter(is_map bool, elem_typ ast.Type, call_exp
} }
pub fn (mut c Checker) method_call(mut call_expr ast.CallExpr) ast.Type { pub fn (mut c Checker) method_call(mut call_expr ast.CallExpr) ast.Type {
was_inside_c_call := c.inside_c_call
c.inside_c_call = call_expr.language == .c
defer {
c.inside_c_call = was_inside_c_call
}
left_type := c.expr(call_expr.left) left_type := c.expr(call_expr.left)
c.expected_type = left_type c.expected_type = left_type
mut is_generic := left_type.has_flag(.generic) mut is_generic := left_type.has_flag(.generic)
@ -2176,10 +2181,10 @@ fn (mut c Checker) array_builtin_method_call(mut call_expr ast.CallExpr, left_ty
} }
pub fn (mut c Checker) fn_call(mut call_expr ast.CallExpr) ast.Type { pub fn (mut c Checker) fn_call(mut call_expr ast.CallExpr) ast.Type {
was_c_call := c.is_c_call was_inside_c_call := c.inside_c_call
c.is_c_call = call_expr.language == .c c.inside_c_call = call_expr.language == .c
defer { defer {
c.is_c_call = was_c_call c.inside_c_call = was_inside_c_call
} }
fn_name := call_expr.name fn_name := call_expr.name
if fn_name == 'main' { if fn_name == 'main' {
@ -2506,6 +2511,10 @@ pub fn (mut c Checker) fn_call(mut call_expr ast.CallExpr) ast.Type {
c.warn('automatic referencing/dereferencing is deprecated and will be removed soon (got: $typ.nr_muls() references, expected: $param.typ.nr_muls() references)', c.warn('automatic referencing/dereferencing is deprecated and will be removed soon (got: $typ.nr_muls() references, expected: $param.typ.nr_muls() references)',
call_arg.pos) call_arg.pos)
} }
if func.language == .c && typ == ast.string_type && param.typ in ast.cptr_or_bptr_types {
c.warn("automatic string to C-string conversion is deprecated and will be removed on 2021-06-19, use `c'<string_value>'` and set the C function parameter type to `&u8`",
call_arg.pos)
}
} }
if func.generic_names.len != call_expr.concrete_types.len { if func.generic_names.len != call_expr.concrete_types.len {
// no type arguments given in call, attempt implicit instantiation // no type arguments given in call, attempt implicit instantiation
@ -4760,10 +4769,6 @@ pub fn (mut c Checker) expr(node ast.Expr) ast.Type {
// string literal starts with "c": `C.printf(c'hello')` // string literal starts with "c": `C.printf(c'hello')`
return ast.byte_type.set_nr_muls(1) return ast.byte_type.set_nr_muls(1)
} }
if node.language != .c && c.is_c_call {
c.warn("automatic string to C-string conversion is deprecated and will be removed on 2021-06-19, use `c'<string_value>'` and set the C function parameter type to `&u8`",
node.pos)
}
return ast.string_type return ast.string_type
} }
ast.StringInterLiteral { ast.StringInterLiteral {