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

checker: IfGuard, map fixes

pull/3798/head
Alexander Medvednikov 2020-02-29 20:11:04 +01:00
parent ee05b51f47
commit 4e88c2286e
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
vlib/v/checker/checker.v
View File

@ -137,7 +137,7 @@ pub fn (c mut Checker) infix_expr(infix_expr ast.InfixExpr) table.Type {
return table.void_type return table.void_type
} }
// `elm in array` // `elm in array`
if right.kind == .array && infix_expr.op == .key_in { if right.kind in [.array, .map] && infix_expr.op == .key_in {
return table.bool_type return table.bool_type
} }
// if !c.table.check(&infix_expr.right_type, &infix_expr.right_type) { // if !c.table.check(&infix_expr.right_type, &infix_expr.right_type) {
@ -523,6 +523,9 @@ pub fn (c mut Checker) expr(node ast.Expr) table.Type {
ast.None { ast.None {
return table.none_type return table.none_type
} }
ast.IfGuardExpr {
return table.bool_type
}
else {} else {}
} }
return table.void_type return table.void_type
@ -711,12 +714,15 @@ pub fn (c mut Checker) index_expr(node ast.IndexExpr) table.Type {
else {} else {}
} }
if !is_range { if !is_range {
index_type := c.expr(node.index)
if !(table.type_idx(index_type) in table.number_idxs) {
index_type_sym := c.table.get_type_symbol(index_type)
c.error('non-integer index (type `$index_type_sym.name`)', node.pos)
}
typ_sym := c.table.get_type_symbol(typ) typ_sym := c.table.get_type_symbol(typ)
index_type := c.expr(node.index)
// println('index expr left=$typ_sym.name $node.pos.line_nr')
if typ_sym.kind == .array && !(table.type_idx(index_type) in table.number_idxs) {
c.error('non-integer index (type `$typ_sym.name`)', node.pos)
}
else if typ_sym.kind == .map && table.type_idx(index_type) != table.string_type_idx {
c.error('non-string map index (type `$typ_sym.name`)', node.pos)
}
if typ_sym.kind == .array { if typ_sym.kind == .array {
// Check index type // Check index type
info := typ_sym.info as table.Array info := typ_sym.info as table.Array