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

fmt: remove cur_short_mod (#9486)

pull/9455/head
Lukas Neubert 2021-03-27 16:29:49 +01:00 committed by GitHub
parent f0e36ca845
commit d9240bd983
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
vlib/v/fmt/fmt.v
View File

@ -30,7 +30,6 @@ pub mut:
array_init_depth int // current level of hierarchie in array init array_init_depth int // current level of hierarchie in array init
single_line_if bool single_line_if bool
cur_mod string cur_mod string
cur_short_mod string // TODO clean this up
file ast.File file ast.File
did_imports bool did_imports bool
is_assign bool is_assign bool
@ -46,7 +45,7 @@ pub mut:
it_name string // the name to replace `it` with it_name string // the name to replace `it` with
inside_lambda bool inside_lambda bool
inside_const bool inside_const bool
is_mbranch_expr bool // math a { x...y { } } is_mbranch_expr bool // match a { x...y { } }
pref &pref.Preferences pref &pref.Preferences
} }
@ -1161,7 +1160,6 @@ pub fn (mut f Fmt) interface_decl(node ast.InterfaceDecl) {
pub fn (mut f Fmt) mod(mod ast.Module) { pub fn (mut f Fmt) mod(mod ast.Module) {
f.set_current_module_name(mod.name) f.set_current_module_name(mod.name)
f.cur_short_mod = mod.short_name
if mod.is_skipped { if mod.is_skipped {
return return
} }
@ -1711,7 +1709,7 @@ pub fn (mut f Fmt) ident(node ast.Ident) {
// (since V's conts are no longer ALL_CAP). // (since V's conts are no longer ALL_CAP).
// ^^^ except for `main`, where consts are allowed to not have a `main.` prefix. // ^^^ except for `main`, where consts are allowed to not have a `main.` prefix.
if !node.name.contains('.') && !f.inside_const { if !node.name.contains('.') && !f.inside_const {
mod := if f.cur_mod == '' { f.cur_short_mod } else { f.cur_mod } // TODO why is this needed? mod := f.cur_mod
full_name := mod + '.' + node.name full_name := mod + '.' + node.name
if obj := f.file.global_scope.find(full_name) { if obj := f.file.global_scope.find(full_name) {
if obj is ast.ConstField { if obj is ast.ConstField {