TheCloud/v
1
0
Fork 0
mirror of https://github.com/vlang/v.git synced 2025-09-23 12:28:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

checker: allow bool int i32 to be used interchangeably for C functions (#25317)

Browse Source
This commit is contained in:
kbkpbot 2025-09-17 01:39:28 +08:00 committed by GitHub
parent 97edd610b0
commit 14ef765151
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
vlib/v/checker/check_types.v
View File

@ -19,6 +19,15 @@ fn (mut c Checker) check_types(got ast.Type, expected ast.Type) bool {
got_is_ptr := got.is_ptr() got_is_ptr := got.is_ptr()
exp_is_ptr := expected.is_ptr() exp_is_ptr := expected.is_ptr()
$if !new_int ? {
// allow int & i32 to be used interchangeably for C functions
// mut flags := C.fcntl(handle, C.F_GETFL, 0)
// flags &= ~C.O_NONBLOCK
if (got in [ast.int_type_idx, ast.int_literal_type_idx] && expected == ast.i32_type_idx)
|| (expected in [ast.int_type_idx, ast.int_literal_type_idx] && got == ast.i32_type_idx) {
return true
}
}
// allow int literals where any kind of real integers are expected: // allow int literals where any kind of real integers are expected:
if (got == ast.int_literal_type && expected.is_pure_int()) if (got == ast.int_literal_type && expected.is_pure_int())
|| (expected == ast.int_literal_type && got.is_pure_int()) { || (expected == ast.int_literal_type && got.is_pure_int()) {
@ -41,8 +50,10 @@ fn (mut c Checker) check_types(got ast.Type, expected ast.Type) bool {
if expected == ast.voidptr_type || expected == ast.nil_type { if expected == ast.voidptr_type || expected == ast.nil_type {
return true return true
} }
if (expected == ast.bool_type && (got_is_int || got_is_any_kind_of_pointer)) if (expected == ast.bool_type && (got_is_int || got_is_any_kind_of_pointer
|| ((exp_is_int || exp_is_any_kind_of_pointer) && got == ast.bool_type) { || got == ast.i32_type))
|| ((exp_is_int || exp_is_any_kind_of_pointer || expected == ast.i32_type)
&& got == ast.bool_type) {
return true return true
} }
@ -229,9 +240,9 @@ fn (mut c Checker) check_expected_call_arg(got_ ast.Type, expected_ ast.Type, la
} }
// allow bool & int to be used interchangeably for C functions // allow bool & int to be used interchangeably for C functions
if (got.idx() == ast.bool_type_idx if (got.idx() == ast.bool_type_idx
&& expected.idx() in [ast.int_type_idx, ast.int_literal_type_idx]) && expected.idx() in [ast.int_type_idx, ast.int_literal_type_idx, ast.i32_type_idx])
|| (expected.idx() == ast.bool_type_idx || (expected.idx() == ast.bool_type_idx
&& got.idx() in [ast.int_type_idx, ast.int_literal_type_idx]) { && got.idx() in [ast.int_type_idx, ast.int_literal_type_idx, ast.i32_type_idx]) {
return return
} }
exp_sym := c.table.sym(expected) exp_sym := c.table.sym(expected)