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: comptime if expr/stmts & type check fixes

Browse Source
This commit is contained in:
Joe Conigliaro
2020-03-22 23:36:27 +11:00
parent cf8776ac71
commit 043ea80fa9
5 changed files with 33 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
vlib/v/table/atypes.v
View File

@@ -175,7 +175,8 @@ pub const (
)
pub const (
number_idxs = [int_type_idx, byte_type_idx, u16_type_idx, i16_type_idx, i64_type_idx, u32_type_idx, u64_type_idx]
number_type_idxs = [int_type_idx, byte_type_idx, u16_type_idx, i16_type_idx, i64_type_idx, u32_type_idx, u64_type_idx, f32_type_idx, f64_type_idx]
pointer_type_idxs = [voidptr_type_idx, byteptr_type_idx, charptr_type_idx]
)
pub const (
@@ -425,6 +426,11 @@ pub fn (t mut Table) register_builtin_type_symbols() {
})
}
[inline]
pub fn (t &TypeSymbol) is_pointer() bool {
return t.kind in [.byteptr, .charptr, .voidptr]
}
[inline]
pub fn (t &TypeSymbol) is_int() bool {
return t.kind in [.i8, .i16, .int, .i64, .byte, .u16, .u32, .u64]

31
vlib/v/table/table.v
View File

@@ -449,39 +449,32 @@ pub fn (t &Table) value_type(typ Type) Type {
}
pub fn (t &Table) check(got, expected Type) bool {
got_type_sym := t.get_type_symbol(got)
exp_type_sym := t.get_type_symbol(expected)
got_idx := type_idx(got)
exp_idx := type_idx(expected)
// got_is_ptr := type_is_ptr(got)
exp_is_ptr := type_is_ptr(expected)
// println('check: $got_type_sym.name, $exp_type_sym.name')
if got_type_sym.kind == .none_ {
// # NOTE: use idxs here, and symbols below for perf
if got_idx == none_type_idx {
// TODO
return true
}
if exp_type_sym.kind == .voidptr {
return true
}
// if got_type_sym.kind == .array_fixed {
// return true
// }
if got_type_sym.kind in [.voidptr, .byteptr, .charptr, .int] && exp_type_sym.kind in [.voidptr, .byteptr, .charptr] {
return true
}
if got_type_sym.is_int() && exp_type_sym.is_int() {
return true
}
// allow pointers to be initialized with 0. TODO: use none instead
if exp_is_ptr && got_idx == int_type_idx {
return true
}
// allow enum value to be used as int
if (got_type_sym.is_int() && exp_type_sym.kind == .enum_) || (exp_type_sym.is_int() && got_type_sym.kind == .enum_) {
if exp_idx == voidptr_type_idx || got_idx == voidptr_type_idx {
return true
}
// TODO
if got_type_sym.is_number() && exp_type_sym.is_number() {
if (exp_idx in pointer_type_idxs || exp_idx in number_type_idxs) //
&& (got_idx in pointer_type_idxs || got_idx in number_type_idxs) {
return true
}
// # NOTE: use symbols from this point on for perf
got_type_sym := t.get_type_symbol(got)
exp_type_sym := t.get_type_symbol(expected)
// allow enum value to be used as int
if (got_type_sym.is_int() && exp_type_sym.kind == .enum_) || (exp_type_sym.is_int() && got_type_sym.kind == .enum_) {
return true
}
// TODO: actually check for & handle pointers with name_expr