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

parser: minor cleanup in global_decl() (#13617)

pull/13618/head
yuyi 2022-02-28 19:30:17 +08:00 committed by GitHub
parent a0d9e6e1c2
commit 013589e9fe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vlib/v/checker/tests/globals/unexpected_eof.out
View File

@ -1,3 +1,3 @@
vlib/v/checker/tests/globals/unexpected_eof.vv:3:1: error: unexpected eof, expecting ´)´ vlib/v/checker/tests/globals/unexpected_eof.vv:3:1: error: unexpected eof, expecting `)`
1 | __global ( 1 | __global (
2 | x string 2 | x string

17
vlib/v/parser/parser.v
View File

@ -3360,7 +3360,7 @@ fn (mut p Parser) global_decl() ast.GlobalDecl {
for { for {
comments = p.eat_comments() comments = p.eat_comments()
if is_block && p.tok.kind == .eof { if is_block && p.tok.kind == .eof {
p.error('unexpected eof, expecting ´)´') p.error('unexpected eof, expecting `)`')
return ast.GlobalDecl{} return ast.GlobalDecl{}
} }
if p.tok.kind == .rpar { if p.tok.kind == .rpar {
@ -3375,18 +3375,9 @@ fn (mut p Parser) global_decl() ast.GlobalDecl {
if has_expr { if has_expr {
p.next() // = p.next() // =
expr = p.expr(0) expr = p.expr(0)
match expr { match mut expr {
ast.CastExpr { ast.CastExpr, ast.StructInit, ast.ArrayInit, ast.ChanInit {
typ = (expr as ast.CastExpr).typ typ = expr.typ
}
ast.StructInit {
typ = (expr as ast.StructInit).typ
}
ast.ArrayInit {
typ = (expr as ast.ArrayInit).typ
}
ast.ChanInit {
typ = (expr as ast.ChanInit).typ
} }
ast.BoolLiteral, ast.IsRefType { ast.BoolLiteral, ast.IsRefType {
typ = ast.bool_type typ = ast.bool_type