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

checker/table: fix sumtype cast from int literal

pull/5654/head^2
joe-conigliaro 2020-07-06 21:27:48 +10:00
parent 25771a1afe
commit d82e6c9cd9
No known key found for this signature in database
GPG Key ID: C12F7136C08206F1
2 changed files with 27 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
vlib/v/checker/checker.v
View File

@ -2090,12 +2090,11 @@ pub fn (mut c Checker) expr(node ast.Expr) table.Type {
expr_type_sym := c.table.get_type_symbol(node.expr_type) expr_type_sym := c.table.get_type_symbol(node.expr_type)
type_sym := c.table.get_type_symbol(node.typ) type_sym := c.table.get_type_symbol(node.typ)
if expr_type_sym.kind == .sum_type { if expr_type_sym.kind == .sum_type {
info := expr_type_sym.info as table.SumType
if type_sym.kind == .placeholder { if type_sym.kind == .placeholder {
// Unknown type used in the right part of `as` // Unknown type used in the right part of `as`
c.error('unknown type `$type_sym.name`', node.pos) c.error('unknown type `$type_sym.name`', node.pos)
} }
if node.typ !in info.variants { if !c.table.sumtype_has_variant(node.expr_type, node.typ) {
c.error('cannot cast `$expr_type_sym.name` to `$type_sym.name`', node.pos) c.error('cannot cast `$expr_type_sym.name` to `$type_sym.name`', node.pos)
// c.error('only $info.variants can be casted to `$typ`', node.pos) // c.error('only $info.variants can be casted to `$typ`', node.pos)
} }
@ -2122,16 +2121,27 @@ pub fn (mut c Checker) expr(node ast.Expr) table.Type {
} }
ast.CastExpr { ast.CastExpr {
node.expr_type = c.expr(node.expr) node.expr_type = c.expr(node.expr)
sym := c.table.get_type_symbol(node.expr_type) from_type_sym := c.table.get_type_symbol(node.expr_type)
if node.typ == table.string_type && !(sym.kind in [.byte, .byteptr] || to_type_sym := c.table.get_type_symbol(node.typ)
(sym.kind == .array && sym.name == 'array_byte')) { if to_type_sym.kind == .sum_type {
if node.expr_type in [table.any_int_type, table.any_flt_type] {
node.expr_type = c.promote_num(
node.expr_type,
if node.expr_type == table.any_int_type { table.int_type } else { table.f64_type },
)
}
if !c.table.sumtype_has_variant(node.typ, node.expr_type) {
c.error('cannot cast `$from_type_sym.name` to `$to_type_sym.name`', node.pos)
}
}
else if node.typ == table.string_type && !(from_type_sym.kind in [.byte, .byteptr] ||
(from_type_sym.kind == .array && from_type_sym.name == 'array_byte')) {
type_name := c.table.type_to_str(node.expr_type) type_name := c.table.type_to_str(node.expr_type)
c.error('cannot cast type `$type_name` to string, use `x.str()` instead', c.error('cannot cast type `$type_name` to string, use `x.str()` instead',
node.pos) node.pos)
} }
if node.expr_type == table.string_type { else if node.expr_type == table.string_type {
cast_to_type_sym := c.table.get_type_symbol(node.typ) if to_type_sym.kind !in [.alias] {
if cast_to_type_sym.kind !in [.alias, .sum_type] {
mut error_msg := 'cannot cast a string' mut error_msg := 'cannot cast a string'
if node.expr is ast.StringLiteral { if node.expr is ast.StringLiteral {
str_lit := node.expr as ast.StringLiteral str_lit := node.expr as ast.StringLiteral

9
vlib/v/tests/sum_type_test.v
View File

@ -133,11 +133,20 @@ type Abc = int | string
fn test_string_cast_to_sumtype() { fn test_string_cast_to_sumtype() {
a := Abc('test') a := Abc('test')
b := Abc(111)
match a { match a {
int {
assert false
}
string { string {
assert true assert true
} }
}
match b {
int { int {
assert true
}
string {
assert false assert false
} }
} }