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: follow up to 43d8bc3, separate setting the default type for fields with default expressions into its own independent loop

Browse Source
This commit is contained in:
Delyan Angelov 2023-01-06 14:47:57 +02:00
parent 3b594d6cd8
commit 2119a240e8
No known key found for this signature in database
GPG Key ID: 66886C0F12D595ED
1 changed files with 27 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
vlib/v/checker/struct.v
View File

@ -6,6 +6,10 @@ import v.ast
import v.util import v.util
fn (mut c Checker) struct_decl(mut node ast.StructDecl) { fn (mut c Checker) struct_decl(mut node ast.StructDecl) {
util.timing_start(@METHOD)
defer {
util.timing_measure_cumulative(@METHOD)
}
mut struct_sym, struct_typ_idx := c.table.find_sym_and_type_idx(node.name) mut struct_sym, struct_typ_idx := c.table.find_sym_and_type_idx(node.name)
mut has_generic_types := false mut has_generic_types := false
if mut struct_sym.info is ast.Struct { if mut struct_sym.info is ast.Struct {
@ -47,6 +51,25 @@ fn (mut c Checker) struct_decl(mut node ast.StructDecl) {
c.error('`typedef` attribute can only be used with C structs', node.pos) c.error('`typedef` attribute can only be used with C structs', node.pos)
} }
} }
// Update .default_expr_typ for all fields in the struct:
util.timing_start('Checker.struct setting default_expr_typ')
old_expected_type := c.expected_type
for mut field in node.fields {
if field.has_default_expr {
c.expected_type = field.typ
field.default_expr_typ = c.expr(field.default_expr)
for mut symfield in struct_sym.info.fields {
if symfield.name == field.name {
symfield.default_expr_typ = field.default_expr_typ
break
}
}
}
}
c.expected_type = old_expected_type
util.timing_measure_cumulative('Checker.struct setting default_expr_typ')
for i, field in node.fields { for i, field in node.fields {
if field.typ.has_flag(.result) { if field.typ.has_flag(.result) {
c.error('struct field does not support storing result', field.optional_pos) c.error('struct field does not support storing result', field.optional_pos)
@ -232,6 +255,10 @@ fn minify_sort_fn(a &ast.StructField, b &ast.StructField) int {
} }
fn (mut c Checker) struct_init(mut node ast.StructInit) ast.Type { fn (mut c Checker) struct_init(mut node ast.StructInit) ast.Type {
util.timing_start(@METHOD)
defer {
util.timing_measure_cumulative(@METHOD)
}
if node.typ == ast.void_type { if node.typ == ast.void_type {
// short syntax `foo(key:val, key2:val2)` // short syntax `foo(key:val, key2:val2)`
if c.expected_type == ast.void_type { if c.expected_type == ast.void_type {