From 3d1db3519d9039ffe424cd0526d3925cf29e383d Mon Sep 17 00:00:00 2001 From: Alexander Medvednikov Date: Wed, 18 Dec 2019 05:45:48 +0300 Subject: [PATCH] test enum printing --- vlib/compiler/tests/enum_test.v | 15 +++++++++------ vlib/compiler/vfmt.v | 7 +++++-- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/vlib/compiler/tests/enum_test.v b/vlib/compiler/tests/enum_test.v index 59d73b9c9e..45f14e3026 100644 --- a/vlib/compiler/tests/enum_test.v +++ b/vlib/compiler/tests/enum_test.v @@ -24,15 +24,18 @@ fn test_in() { num := 3 // used to be an expr bug before `in` assert color in [.red, .green] assert num == 3 -} + println(color) + assert true +} fn test_match() { - color := Color.red + color := Color.green num := 3 match color { - .red { assert true } - .green { assert false } + .red { assert false } + .green { assert true } else { assert false } - } + } + println(color) assert num == 3 -} +} diff --git a/vlib/compiler/vfmt.v b/vlib/compiler/vfmt.v index 9724bb33b2..6eca59bce9 100644 --- a/vlib/compiler/vfmt.v +++ b/vlib/compiler/vfmt.v @@ -229,8 +229,11 @@ fn (p &Parser) gen_fmt() { } //s := p.scanner.fmt_out.str().replace('\n\n\n', '\n').trim_space() //s := p.scanner.fmt_out.str().trim_space() - s := p.scanner.fmt_lines.join('').trim_space().replace('\n\n\n\n', '\n\n') - .replace(' \n', '\n') + s := p.scanner.fmt_lines.join('').trim_space().replace_each([ + '\n\n\n\n', '\n\n', + ' \n', '\n', + ') or{', ') or {', + ]) if s == '' { return }