mirrors/v
1
0
Fork 0
mirror of https://github.com/vlang/v.git synced 2025-09-13 22:42:26 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

rename inside_import_section; fix is_in_top_level_comptime()

Browse source
This commit is contained in:
kbkpbot 2025-09-02 08:29:32 +08:00
parent e34603165c
commit 6cd6832ed5
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
vlib/v/parser/parser.v
View file

@ -111,7 +111,7 @@ mut:
generic_type_level int // to avoid infinite recursion segfaults due to compiler bugs in ensure_type_exists generic_type_level int // to avoid infinite recursion segfaults due to compiler bugs in ensure_type_exists
main_already_defined bool // TODO move to checker main_already_defined bool // TODO move to checker
is_vls bool is_vls bool
is_begining_of_file bool inside_import_section bool
pub mut: pub mut:
scanner &scanner.Scanner = unsafe { nil } scanner &scanner.Scanner = unsafe { nil }
table &ast.Table = unsafe { nil } table &ast.Table = unsafe { nil }
@ -291,7 +291,7 @@ pub fn (mut p Parser) parse() &ast.File {
} else { } else {
stmts << module_decl stmts << module_decl
} }
p.is_begining_of_file = true p.inside_import_section = true
// imports // imports
for { for {
if p.tok.kind == .key_import { if p.tok.kind == .key_import {
@ -455,7 +455,7 @@ fn (mut p Parser) parse_block() []ast.Stmt {
fn (mut p Parser) is_in_top_level_comptime(inside_assign_rhs bool) bool { fn (mut p Parser) is_in_top_level_comptime(inside_assign_rhs bool) bool {
// TODO: find out a better way detect we are in top level. // TODO: find out a better way detect we are in top level.
return p.cur_fn_name == '' && p.inside_ct_if_expr && !inside_assign_rhs && !p.script_mode return p.cur_fn_name.len == 0 && p.inside_ct_if_expr && !inside_assign_rhs && !p.script_mode
&& p.tok.kind != .name && p.tok.kind != .name
} }
@ -631,8 +631,8 @@ fn (mut p Parser) top_stmt() ast.Stmt {
p.trace_parser('top_stmt') p.trace_parser('top_stmt')
for { for {
if p.tok.kind !in [.key_import, .comment, .dollar] { if p.tok.kind !in [.key_import, .comment, .dollar] {
// beginning of the file should only prepend by `import`, `comment` or `$if`. // import section should only prepend by `import`, `comment` or `$if`.
p.is_begining_of_file = false p.inside_import_section = false
} }
match p.tok.kind { match p.tok.kind {
.key_pub { .key_pub {
@ -677,7 +677,7 @@ fn (mut p Parser) top_stmt() ast.Stmt {
return p.interface_decl() return p.interface_decl()
} }
.key_import { .key_import {
if !p.is_begining_of_file { if !p.inside_import_section {
p.error_with_pos('`import x` can only be declared at the beginning of the file', p.error_with_pos('`import x` can only be declared at the beginning of the file',
p.tok.pos()) p.tok.pos())
} }