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

checker: make << shifts work with custom number types

pull/6105/head
Alexander Medvednikov 2020-08-11 01:05:34 +02:00
parent 2dd82748e0
commit 1a9dba0005
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -144,8 +144,12 @@ pub fn (mut c Checker) check_matching_function_symbols(got_type_sym, exp_type_sy
[inline] [inline]
fn (mut c Checker) check_shift(left_type, right_type table.Type, left_pos, right_pos token.Position) table.Type { fn (mut c Checker) check_shift(left_type, right_type table.Type, left_pos, right_pos token.Position) table.Type {
if !left_type.is_int() { if !left_type.is_int() {
c.error('invalid operation: shift of type `${c.table.get_type_symbol(left_type).name}`', // maybe it's an int alias? TODO move this to is_int() ?
left_pos) sym := c.table.get_type_symbol(left_type)
if sym.kind == .alias && (sym.info as table.Alias).parent_type.is_int() {
return left_type
}
c.error('invalid operation: shift of type `$sym.name`', left_pos)
return table.void_type return table.void_type
} else if !right_type.is_int() { } else if !right_type.is_int() {
c.error('cannot shift non-integer type ${c.table.get_type_symbol(right_type).name} into type ${c.table.get_type_symbol(left_type).name}', c.error('cannot shift non-integer type ${c.table.get_type_symbol(right_type).name} into type ${c.table.get_type_symbol(left_type).name}',

5
vlib/v/tests/shift_test.v
View File

@ -1,3 +1,5 @@
type MyInt int
fn test_shift_operators() { fn test_shift_operators() {
// check that shift works with all integer types // check that shift works with all integer types
// as the right-hand side operand // as the right-hand side operand
@ -63,4 +65,7 @@ fn test_shift_operators() {
assert e3 == b assert e3 == b
e3 >>= u64(i) e3 >>= u64(i)
assert e3 == a assert e3 == a
// Test shifts with custom int types
x := MyInt(2)
assert x << 2 == 8
} }