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

fmt: extract common code to methods

pull/3908/merge
Alexey 2020-03-02 19:09:45 +03:00 committed by GitHub
parent 8497d637d9
commit cca5c5537f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 27 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
vlib/v/fmt/fmt.v
View File

@ -330,24 +330,9 @@ fn (f mut Fmt) expr(node ast.Expr) {
} }
ast.CallExpr { ast.CallExpr {
f.write('${it.name}(') f.write('${it.name}(')
for i, arg in it.args { f.call_args(it.args, it.muts)
if it.muts[i] {
f.write('mut ')
}
if i > 0 {
f.wrap_long_line()
}
f.expr(arg)
if i < it.args.len - 1 {
f.write(', ')
}
}
f.write(')') f.write(')')
if it.or_block.stmts.len > 0 { f.or_expr(it.or_block)
f.writeln(' or {')
f.stmts(it.or_block.stmts)
f.write('}')
}
} }
ast.CharLiteral { ast.CharLiteral {
f.write('`$it.val`') f.write('`$it.val`')
@ -464,24 +449,9 @@ fn (f mut Fmt) expr(node ast.Expr) {
ast.MethodCallExpr { ast.MethodCallExpr {
f.expr(it.expr) f.expr(it.expr)
f.write('.' + it.name + '(') f.write('.' + it.name + '(')
for i, arg in it.args { f.call_args(it.args, it.muts)
if it.muts[i] {
f.write('mut ')
}
if i > 0 {
f.wrap_long_line()
}
f.expr(arg)
if i < it.args.len - 1 {
f.write(', ')
}
}
f.write(')') f.write(')')
if it.or_block.stmts.len > 0 { f.or_expr(it.or_block)
f.writeln(' or {')
f.stmts(it.or_block.stmts)
f.write('}')
}
} }
ast.None { ast.None {
f.write('none') f.write('none')
@ -549,3 +519,26 @@ fn (f mut Fmt) wrap_long_line() {
f.line_len = 0 f.line_len = 0
} }
} }
fn (f mut Fmt) call_args(args []ast.Expr, muts []bool) {
for i, arg in args {
if muts[i] {
f.write('mut ')
}
if i > 0 {
f.wrap_long_line()
}
f.expr(arg)
if i < args.len - 1 {
f.write(', ')
}
}
}
fn (f mut Fmt) or_expr(or_block ast.OrExpr) {
if or_block.stmts.len > 0 {
f.writeln(' or {')
f.stmts(or_block.stmts)
f.write('}')
}
}