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

checker: check struct field name using uppercase letters (#14220)

master
yuyi 2022-04-29 19:57:14 +08:00 committed by GitHub
parent 872f739396
commit 317acfda97
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
vlib/v/checker/tests/struct_field_name_err.out
View File

@ -1,13 +1,20 @@
vlib/v/checker/tests/struct_field_name_err.vv:2:2: error: field name `Architecture` cannot contain uppercase letters, use snake_case instead vlib/v/checker/tests/struct_field_name_err.vv:2:2: error: field name `Foo` cannot contain uppercase letters, use snake_case instead
1 | struct Release { 1 | struct Release {
2 | Architecture []string 2 | Foo string
| ~~~~~~~~~~~~~~~~~~~~~ | ~~~~~~~~~~~~~~~~~~~
3 | Components []string 3 | Bar &int
4 | } 4 | Architecture []string
vlib/v/checker/tests/struct_field_name_err.vv:3:2: error: field name `Components` cannot contain uppercase letters, use snake_case instead vlib/v/checker/tests/struct_field_name_err.vv:3:2: error: field name `Bar` cannot contain uppercase letters, use snake_case instead
1 | struct Release { 1 | struct Release {
2 | Architecture []string 2 | Foo string
3 | Components []string 3 | Bar &int
| ~~~~~~~~~~~~~~~~~
4 | Architecture []string
5 | }
vlib/v/checker/tests/struct_field_name_err.vv:4:2: error: field name `Architecture` cannot contain uppercase letters, use snake_case instead
2 | Foo string
3 | Bar &int
4 | Architecture []string
| ~~~~~~~~~~~~~~~~~~~~~ | ~~~~~~~~~~~~~~~~~~~~~
4 | } 5 | }
5 | 6 |

5
vlib/v/checker/tests/struct_field_name_err.vv
View File

@ -1,9 +1,8 @@
struct Release { struct Release {
Foo string
Bar &int
Architecture []string Architecture []string
Components []string
} }
fn main() { fn main() {
r := Release{}
println(r)
} }

1
vlib/v/parser/struct.v
View File

@ -185,6 +185,7 @@ fn (mut p Parser) struct_decl() ast.StructDecl {
is_field_volatile = true is_field_volatile = true
} }
is_embed := ((p.tok.lit.len > 1 && p.tok.lit[0].is_capital() is_embed := ((p.tok.lit.len > 1 && p.tok.lit[0].is_capital()
&& (p.peek_tok.line_nr != p.tok.line_nr || p.peek_tok.kind !in [.name, .amp])
&& (p.peek_tok.kind != .lsbr || p.peek_token(2).kind != .rsbr)) && (p.peek_tok.kind != .lsbr || p.peek_token(2).kind != .rsbr))
|| p.peek_tok.kind == .dot) && language == .v && p.peek_tok.kind != .key_fn || p.peek_tok.kind == .dot) && language == .v && p.peek_tok.kind != .key_fn
is_on_top := ast_fields.len == 0 && !(is_field_mut || is_field_global) is_on_top := ast_fields.len == 0 && !(is_field_mut || is_field_global)