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: cleanup in if_expr() (#15347)

Browse Source
This commit is contained in:
yuyi 2022-08-05 08:02:22 +08:00 committed by GitHub
parent 9e50803071
commit ab244d2236
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
vlib/v/checker/if.v
View File

@ -59,21 +59,22 @@ pub fn (mut c Checker) if_expr(mut node ast.IfExpr) ast.Type {
mut comptime_field_name := ''
if mut branch.cond is ast.InfixExpr {
if branch.cond.op == .key_is {
if branch.cond.right !is ast.TypeNode && branch.cond.right !is ast.ComptimeType {
left := branch.cond.left
right := branch.cond.right
if right !in [ast.TypeNode, ast.ComptimeType] {
c.error('invalid `\$if` condition: expected a type', branch.cond.right.pos())
return 0
}
left := branch.cond.left
if branch.cond.right is ast.ComptimeType && left is ast.TypeNode {
if right is ast.ComptimeType && left is ast.TypeNode {
is_comptime_type_is_expr = true
checked_type := c.unwrap_generic(left.typ)
skip_state = if c.table.is_comptime_type(checked_type, branch.cond.right as ast.ComptimeType) {
skip_state = if c.table.is_comptime_type(checked_type, right as ast.ComptimeType) {
.eval
} else {
.skip
}
} else {
got_type := c.unwrap_generic((branch.cond.right as ast.TypeNode).typ)
got_type := c.unwrap_generic((right as ast.TypeNode).typ)
sym := c.table.sym(got_type)
if sym.kind == .placeholder || got_type.has_flag(.generic) {
c.error('unknown type `$sym.name`', branch.cond.right.pos())
@ -83,7 +84,7 @@ pub fn (mut c Checker) if_expr(mut node ast.IfExpr) ast.Type {
comptime_field_name = left.expr.str()
c.comptime_fields_type[comptime_field_name] = got_type
is_comptime_type_is_expr = true
} else if branch.cond.right is ast.TypeNode && left is ast.TypeNode
} else if right is ast.TypeNode && left is ast.TypeNode
&& sym.kind == .interface_ {
is_comptime_type_is_expr = true
// is interface