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

lots of vfmt fixes

Browse Source
This commit is contained in:
Alexander Medvednikov
2019-11-09 19:13:26 +03:00
parent aef02f61e1
commit b1d2c6c730
5 changed files with 90 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
vlib/compiler/struct.v
View File

@ -22,9 +22,9 @@ fn (p mut Parser) struct_decl() {
if is_objc {
cat = .objc_interface
}
p.fgen(p.tok.str() + ' ')
// Get type name
p.next()
p.fspace()
// Get type name
mut name := p.check_name()
if name.contains('_') && !p.pref.translated {
p.error('type names cannot contain `_`')
@ -105,7 +105,7 @@ fn (p mut Parser) struct_decl() {
p.table.register_type2(typ)
return
}
p.fgen(' ')
p.fspace()
p.check(.lcbr)
// Struct fields
mut is_pub_field := false
@ -139,7 +139,7 @@ fn (p mut Parser) struct_decl() {
p.check(.colon)
}
p.fmt_inc()
p.fgenln('')
p.fgenln2('')
}
if p.tok == .key_mut {
if is_mut {
@ -152,7 +152,7 @@ fn (p mut Parser) struct_decl() {
p.check(.colon)
}
p.fmt_inc()
p.fgenln('')
p.fgenln2('')
}
// if is_pub {
// }
@ -182,7 +182,7 @@ fn (p mut Parser) struct_decl() {
}
// `pub` access mod
access_mod := if is_pub_field { AccessMod.public } else { AccessMod.private}
p.fgen(' ')
p.fspace()
field_type := p.get_type()
if field_type == name {
p.error_with_token_index( 'cannot embed struct `$name` in itself (field `$field_name`)', field_name_token_idx)
@ -195,6 +195,7 @@ fn (p mut Parser) struct_decl() {
// [ATTR]
mut attr := ''
if p.tok == .lsbr {
p.fspace()
p.next()
attr = p.check_name()
if p.tok == .colon {
@ -219,13 +220,13 @@ fn (p mut Parser) struct_decl() {
if p.first_pass() {
p.table.add_field(typ.name, field_name, field_type, is_mut, attr, access_mod)
}
p.fgenln('')
p.fgenln2('')
}
p.check(.rcbr)
if !is_c && !did_gen_something && p.first_pass() {
p.table.add_field(typ.name, '', 'EMPTY_STRUCT_DECLARATION', false, '', .private)
}
p.fgenln('\n')
p.fgenln2('\n')
}
// `User{ foo: bar }`
@ -269,7 +270,7 @@ fn (p mut Parser) struct_init(typ string) string {
if p.tok != .rcbr {
p.gen(',')
}
p.fgenln('')
p.fspace()
did_gen_something = true
}
// If we already set some fields, need to prepend a comma