From 5ad957f27038515920cb446c35520535143787ea Mon Sep 17 00:00:00 2001 From: Delyan Angelov Date: Tue, 14 Jul 2020 19:11:16 +0300 Subject: [PATCH] vfmt: fix formatting for `x, _ := f()` --- vlib/v/checker/checker.v | 5 +---- vlib/v/fmt/fmt.v | 6 +++--- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/vlib/v/checker/checker.v b/vlib/v/checker/checker.v index 379aeb6040..ead6d343bc 100644 --- a/vlib/v/checker/checker.v +++ b/vlib/v/checker/checker.v @@ -2868,15 +2868,12 @@ pub fn (mut c Checker) postfix_expr(mut node ast.PostfixExpr) table.Type { println(typ_sym.kind.str()) c.error('invalid operation: $node.op.str() (non-numeric type `$typ_sym.name`)', node.pos) - } - // - else { + } else { node.auto_locked, _ = c.fail_if_immutable(node.expr) } if (typ.is_ptr() || typ_sym.is_pointer()) && !c.inside_unsafe { c.error('pointer arithmetic is only allowed in `unsafe` blocks', node.pos) } - return typ } diff --git a/vlib/v/fmt/fmt.v b/vlib/v/fmt/fmt.v index 02d6b43830..5c994d0cbd 100644 --- a/vlib/v/fmt/fmt.v +++ b/vlib/v/fmt/fmt.v @@ -258,12 +258,12 @@ pub fn (mut f Fmt) stmt(node ast.Stmt) { f.write(var_info.share.str() + ' ') } f.expr(left) - if i < node.left.len - 1 { - f.write(', ') - } } else { f.expr(left) } + if i < node.left.len - 1 { + f.write(', ') + } } f.is_assign = true f.write(' $node.op.str() ')