From e0db8807914d19780d008ef3db3ba03241198725 Mon Sep 17 00:00:00 2001 From: Ned Palacios Date: Wed, 27 May 2020 21:26:45 +0800 Subject: [PATCH] fmt: simplify map_init --- vlib/v/fmt/fmt.v | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/vlib/v/fmt/fmt.v b/vlib/v/fmt/fmt.v index ecc6899f2d..5fc34723c1 100644 --- a/vlib/v/fmt/fmt.v +++ b/vlib/v/fmt/fmt.v @@ -590,18 +590,22 @@ pub fn (mut f Fmt) expr(node ast.Expr) { } ast.MapInit { if it.keys.len == 0 { - if it.value_type == 0 { + mut ktyp := it.key_type + mut vtyp := it.value_type + + if vtyp == 0 { typ_sym := f.table.get_type_symbol(it.typ) minfo := typ_sym.info as table.Map - mk := f.table.get_type_symbol(minfo.key_type).name - mv := f.table.get_type_symbol(minfo.value_type).name - f.write('map[${mk}]${mv}{}') - return + + ktyp = minfo.key_type + vtyp = minfo.value_type } + f.write('map[') - f.write(f.type_to_str(it.key_type)) + f.write(f.type_to_str(ktyp)) f.write(']') - f.write(f.type_to_str(it.value_type)) + f.write(f.type_to_str(vtyp)) + f.write('{}') return } f.writeln('{')