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

fmt: relocate two methods; minor cleanup (#8423)

pull/8433/head
Lukas Neubert 2021-01-29 22:15:26 +01:00 committed by GitHub
parent e03ece2a4b
commit 974cac2037
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
vlib/v/fmt/fmt.v
View File

@ -116,6 +116,14 @@ fn (mut f Fmt) write_indent() {
f.line_len += f.indent * 4
}
fn (mut f Fmt) write_language_prefix(lang table.Language) {
match lang {
.c { f.write('C.') }
.js { f.write('JS.') }
else {}
}
}
pub fn (mut f Fmt) wrap_long_line(penalty_idx int, add_indent bool) bool {
if f.buffering {
return false
@ -147,7 +155,6 @@ pub fn (mut f Fmt) remove_new_line() {
}
f.out.go_back(f.out.len - i - 1)
f.empty_line = false
// f.writeln('sdf')
}
pub fn (mut f Fmt) set_current_module_name(cmodname string) {
@ -166,6 +173,16 @@ fn (f Fmt) get_modname_prefix(mname string) (string, string) {
return modname, mname.trim_suffix(modname)
}
fn (mut f Fmt) is_external_name(name string) bool {
if name.len > 2 && name[0] == `C` && name[1] == `.` {
return true
}
if name.len > 3 && name[0] == `J` && name[1] == `S` && name[2] == `.` {
return true
}
return false
}
pub fn (mut f Fmt) no_cur_mod(typename string) string {
return util.no_cur_mod(typename, f.cur_mod)
}
@ -226,7 +243,6 @@ pub fn (mut f Fmt) mark_import_as_used(name string) {
return
}
f.used_imports << mod
// println('marking module $mod as used')
}
pub fn (mut f Fmt) imports(imports []ast.Import) {
@ -402,7 +418,6 @@ pub fn (mut f Fmt) stmt(node ast.Stmt) {
f.struct_decl(node)
}
ast.TypeDecl {
// already handled in f.imports
f.type_decl(node)
}
}
@ -1060,8 +1075,6 @@ fn inline_attrs_len(attrs []table.Attr) int {
}
pub fn (mut f Fmt) fn_decl(node ast.FnDecl) {
// println('$it.name find_comment($it.pos.line_nr)')
// f.find_comment(it.pos.line_nr)
f.attrs(node.attrs)
f.write(node.stringify(f.table, f.cur_mod, f.mod2alias)) // `Expr` instead of `ast.Expr` in mod ast
if node.language == .v {
@ -1829,14 +1842,6 @@ pub fn (mut f Fmt) match_expr(it ast.MatchExpr) {
f.it_name = ''
}
fn (mut f Fmt) write_language_prefix(lang table.Language) {
match lang {
.c { f.write('C.') }
.js { f.write('JS.') }
else {}
}
}
pub fn (mut f Fmt) chan_init(mut it ast.ChanInit) {
info := f.table.get_type_symbol(it.typ).chan_info()
if it.elem_type == 0 && it.typ > 0 {
@ -1895,7 +1900,6 @@ pub fn (mut f Fmt) array_init(it ast.ArrayInit) {
return
}
// `[1,2,3]`
// type_sym := f.table.get_type_symbol(it.typ)
f.write('[')
mut inc_indent := false
mut last_line_nr := it.pos.line_nr // to have the same newlines between array elements
@ -2027,9 +2031,7 @@ pub fn (mut f Fmt) struct_init(it ast.StructInit) {
}
} else if it.is_short {
// `Foo{1,2,3}` (short syntax )
// if name != '' {
f.write('$name{')
// }
if it.has_update_expr {
f.write('...')
f.expr(it.update_expr)
@ -2202,16 +2204,6 @@ fn (mut f Fmt) global_decl(it ast.GlobalDecl) {
f.writeln(')\n')
}
fn (mut f Fmt) is_external_name(name string) bool {
if name.len > 2 && name[0] == `C` && name[1] == `.` {
return true
}
if name.len > 3 && name[0] == `J` && name[1] == `S` && name[2] == `.` {
return true
}
return false
}
pub fn (mut f Fmt) assign_stmt(node ast.AssignStmt) {
f.comments(node.comments, {})
for i, left in node.left {
@ -2356,11 +2348,10 @@ pub fn (mut f Fmt) for_stmt(node ast.ForStmt) {
}
f.write('for ')
f.expr(node.cond)
if node.is_inf {
f.write('{')
} else {
f.write(' {')
if !node.is_inf {
f.write(' ')
}
f.write('{')
if node.stmts.len > 0 || node.pos.line_nr < node.pos.last_line {
f.writeln('')
f.stmts(node.stmts)