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

parser: support a `[has_globals]` module attribute, to eliminate a parser whitelist (part 1)

pull/12482/head
Delyan Angelov 2021-11-16 11:34:26 +02:00
parent 3f37ab2ef2
commit f0f5f97e9f
No known key found for this signature in database
GPG Key ID: 66886C0F12D595ED
1 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
vlib/v/parser/parser.v
View File

@ -34,6 +34,7 @@ mut:
table &ast.Table table &ast.Table
language ast.Language language ast.Language
fn_language ast.Language // .c for `fn C.abcd()` declarations fn_language ast.Language // .c for `fn C.abcd()` declarations
inside_vlib_file bool // true for all vlib/ files
inside_test_file bool // when inside _test.v or _test.vv file inside_test_file bool // when inside _test.v or _test.vv file
inside_if bool inside_if bool
inside_if_expr bool inside_if_expr bool
@ -49,6 +50,7 @@ mut:
builtin_mod bool // are we in the `builtin` module? builtin_mod bool // are we in the `builtin` module?
mod string // current module name mod string // current module name
is_manualfree bool // true when `[manualfree] module abc`, makes *all* fns in the current .v file, opt out of autofree is_manualfree bool // true when `[manualfree] module abc`, makes *all* fns in the current .v file, opt out of autofree
has_globals bool // `[has_globals] module abc` - allow globals declarations, even without -enable-globals, in that single .v file __only__
attrs []ast.Attr // attributes before next decl stmt attrs []ast.Attr // attributes before next decl stmt
expr_mod string // for constructing full type names in parse_type() expr_mod string // for constructing full type names in parse_type()
scope &ast.Scope scope &ast.Scope
@ -154,6 +156,9 @@ pub fn (mut p Parser) set_path(path string) {
p.file_name = path p.file_name = path
p.file_base = os.base(path) p.file_base = os.base(path)
p.file_name_dir = os.dir(path) p.file_name_dir = os.dir(path)
if p.file_name_dir.contains('vlib') {
p.inside_vlib_file = true
}
hash := fnv1a.sum64_string(path) hash := fnv1a.sum64_string(path)
p.unique_prefix = hash.hex_full() p.unique_prefix = hash.hex_full()
if p.file_base.ends_with('_test.v') || p.file_base.ends_with('_test.vv') { if p.file_base.ends_with('_test.v') || p.file_base.ends_with('_test.vv') {
@ -2823,6 +2828,14 @@ fn (mut p Parser) module_decl() ast.Module {
'manualfree' { 'manualfree' {
p.is_manualfree = true p.is_manualfree = true
} }
'has_globals' {
if p.inside_vlib_file {
p.has_globals = true
} else {
p.error_with_pos('[has_globals] is allowed only in .v files of `vlib` modules',
ma.pos)
}
}
else { else {
p.error_with_pos('unknown module attribute `[$ma.name]`', ma.pos) p.error_with_pos('unknown module attribute `[$ma.name]`', ma.pos)
return mod_node return mod_node
@ -3061,15 +3074,14 @@ fn (mut p Parser) return_stmt() ast.Return {
} }
} }
const ( // TODO: remove this whitelist of modules which allow globals by default
// modules which allow globals by default const global_enabled_mods = ['rand', 'sokol.sapp']
global_enabled_mods = ['rand', 'sokol.sapp']
)
// left hand side of `=` or `:=` in `a,b,c := 1,2,3` // left hand side of `=` or `:=` in `a,b,c := 1,2,3`
fn (mut p Parser) global_decl() ast.GlobalDecl { fn (mut p Parser) global_decl() ast.GlobalDecl {
if !p.pref.translated && !p.pref.is_livemain && !p.builtin_mod && !p.pref.building_v if !p.has_globals && !p.pref.enable_globals && !p.pref.is_fmt && !p.pref.translated
&& !p.pref.enable_globals && !p.pref.is_fmt && p.mod !in parser.global_enabled_mods { && !p.pref.is_livemain && !p.pref.building_v && !p.builtin_mod
&& p.mod !in parser.global_enabled_mods {
p.error('use `v -enable-globals ...` to enable globals') p.error('use `v -enable-globals ...` to enable globals')
return ast.GlobalDecl{} return ast.GlobalDecl{}
} }