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

key in map syntax

Browse Source
This commit is contained in:
Alexander Medvednikov
2019-07-23 22:57:06 +02:00
parent bd95f5bf8f
commit 527b9e13fa
5 changed files with 24 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
compiler/table.v
View File

@ -699,7 +699,7 @@ fn new_file_import_table(file_path string) *FileImportTable {
}
fn (fit &FileImportTable) known_import(mod string) bool {
return fit.imports.exists(mod) || fit.is_aliased(mod)
return mod in fit.imports || fit.is_aliased(mod)
}
fn (fit mut FileImportTable) register_import(mod string) {
@ -707,7 +707,7 @@ fn (fit mut FileImportTable) register_import(mod string) {
}
fn (fit mut FileImportTable) register_alias(alias string, mod string) {
if fit.imports.exists(alias) {
if alias in fit.imports {
panic('cannot import $mod as $alias: import name $alias already in use in "${fit.file_path}".')
return
}
@ -715,7 +715,7 @@ fn (fit mut FileImportTable) register_alias(alias string, mod string) {
}
fn (fit &FileImportTable) known_alias(alias string) bool {
return fit.imports.exists(alias)
return alias in fit.imports
}
fn (fit &FileImportTable) is_aliased(mod string) bool {
@ -728,8 +728,5 @@ fn (fit &FileImportTable) is_aliased(mod string) bool {
}
fn (fit &FileImportTable) resolve_alias(alias string) string {
if fit.imports.exists(alias) {
return fit.imports[alias]
}
return ''
return fit.imports[alias]
}