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

vfmt: fix formatting of 'import mod as alias'

pull/3290/head
Delyan Angelov 2019-12-31 20:26:44 +02:00 committed by Alexander Medvednikov
parent 286a0a1371
commit 222f2f08f6
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
vlib/compiler/aparser.v
View File

@ -658,7 +658,9 @@ fn (p mut Parser) import_statement() {
} }
// aliasing (import encoding.base64 as b64) // aliasing (import encoding.base64 as b64)
if p.tok == .key_as && p.peek() == .name { if p.tok == .key_as && p.peek() == .name {
p.fspace()
p.check(.key_as) p.check(.key_as)
p.fspace()
mod_alias = p.check_name() mod_alias = p.check_name()
} }
// add import to file scope import table // add import to file scope import table
@ -1169,7 +1171,7 @@ fn (p mut Parser) get_type() string {
} }
t = p.table.find_type(typ) t = p.table.find_type(typ)
if t.name == '' && !p.pref.translated && !p.first_pass() && !typ.starts_with('[') { if t.name == '' && !p.pref.translated && !p.first_pass() && !typ.starts_with('[') {
println('get_type() bad type') // println('get_type() bad type')
// println('all registered types:') // println('all registered types:')
// for q in p.table.types { // for q in p.table.types {
// println(q.name) // println(q.name)
@ -1178,7 +1180,8 @@ fn (p mut Parser) get_type() string {
if t_suggest.len > 0 { if t_suggest.len > 0 {
t_suggest = '. did you mean: ($tc_suggest) `$t_suggest`' t_suggest = '. did you mean: ($tc_suggest) `$t_suggest`'
} }
p.error('unknown type `$typ`$t_suggest') econtext := if p.pref.is_debug { '('+@FILE+':'+@LINE+')' } else {''}
p.error('unknown type `$typ`$t_suggest $econtext')
} }
} }
else if !t.is_public && t.mod != p.mod && !p.is_vgen && t.name != '' && !p.first_pass() { else if !t.is_public && t.mod != p.mod && !p.is_vgen && t.name != '' && !p.first_pass() {

5
vlib/compiler/get_type.v
View File

@ -164,7 +164,7 @@ fn (p mut Parser) get_type2() Type {
} }
t = p.table.find_type(typ) t = p.table.find_type(typ)
if t.name == '' && !p.pref.translated && !p.first_pass() && !typ.starts_with('[') { if t.name == '' && !p.pref.translated && !p.first_pass() && !typ.starts_with('[') {
println('get_type() bad type') //println('get_type() bad type')
// println('all registered types:') // println('all registered types:')
// for q in p.table.types { // for q in p.table.types {
// println(q.name) // println(q.name)
@ -173,7 +173,8 @@ fn (p mut Parser) get_type2() Type {
if t_suggest.len > 0 { if t_suggest.len > 0 {
t_suggest = '. did you mean: ($tc_suggest) `$t_suggest`' t_suggest = '. did you mean: ($tc_suggest) `$t_suggest`'
} }
p.error('unknown type `$typ`$t_suggest') econtext := if p.pref.is_debug { '('+@FILE+':'+@LINE+')' } else {''}
p.error('unknown type `$typ`$t_suggest $econtext')
} }
} }
else if !t.is_public && t.mod != p.mod && !p.is_vgen && t.name != '' && !p.first_pass() { else if !t.is_public && t.mod != p.mod && !p.is_vgen && t.name != '' && !p.first_pass() {

4
vlib/compiler/vfmt.v
View File

@ -171,7 +171,9 @@ fn (p mut Parser) fnext() {
p.fgen_nl() p.fgen_nl()
p.fmt_inc() p.fmt_inc()
} }
if p.token_idx >= p.tokens.len {
return
}
// Skip comments and add them to vfmt output // Skip comments and add them to vfmt output
if p.tokens[p.token_idx].tok in [.line_comment, .mline_comment] { if p.tokens[p.token_idx].tok in [.line_comment, .mline_comment] {
// Newline before the comment and after consts and closing } // Newline before the comment and after consts and closing }