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

checker: check struct field types

pull/4613/head
Alexander Medvednikov 2020-04-26 18:38:29 +02:00
parent 83552a0d58
commit 8223efe9df
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
vlib/v/checker/checker.v
View File

@ -203,18 +203,22 @@ pub fn (mut c Checker) struct_decl(decl ast.StructDecl) {
} }
c.error('struct name must begin with capital letter', pos) c.error('struct name must begin with capital letter', pos)
} }
for fi, _ in decl.fields { for fi, field in decl.fields {
if decl.fields[fi].has_default_expr { sym := c.table.get_type_symbol(field.typ)
c.expected_type = decl.fields[fi].typ if sym.kind == .placeholder {
field_expr_type := c.expr(decl.fields[fi].default_expr) c.error('unknown type `$sym.name`', field.pos)
if !c.table.check(field_expr_type, decl.fields[fi].typ) { }
if field.has_default_expr {
c.expected_type = field.typ
field_expr_type := c.expr(field.default_expr)
if !c.table.check(field_expr_type, field.typ) {
field_expr_type_sym := c.table.get_type_symbol(field_expr_type) field_expr_type_sym := c.table.get_type_symbol(field_expr_type)
field_type_sym := c.table.get_type_symbol(decl.fields[fi].typ) field_type_sym := c.table.get_type_symbol(field.typ)
field_name := decl.fields[fi].name field_name := field.name
fet_name := field_expr_type_sym.name fet_name := field_expr_type_sym.name
ft_name := field_type_sym.name ft_name := field_type_sym.name
c.error('default expression for field `${field_name}` ' + 'has type `${fet_name}`, but should be `${ft_name}`', c.error('default expression for field `${field_name}` ' + 'has type `${fet_name}`, but should be `${ft_name}`',
decl.fields[fi].default_expr.position()) field.default_expr.position())
} }
} }
} }