From d59aa14b266049aa6fa57d9d3e6d8ffca8514292 Mon Sep 17 00:00:00 2001
From: Delyan Angelov <delian66@gmail.com>
Date: Sat, 4 Dec 2021 13:04:51 +0200
Subject: [PATCH] builtin: fix {-7:08b} (interpolation of negative numbers with
 0 padding), add tests

---
 vlib/builtin/string_int_test.v      | 57 +++++++++++++++++++++++++++++
 vlib/builtin/string_interpolation.v | 11 +++++-
 2 files changed, 67 insertions(+), 1 deletion(-)

diff --git a/vlib/builtin/string_int_test.v b/vlib/builtin/string_int_test.v
index 3c055092c1..756bdbe00b 100644
--- a/vlib/builtin/string_int_test.v
+++ b/vlib/builtin/string_int_test.v
@@ -254,3 +254,60 @@ fn test_binary64() {
 	assert '${i:064b}' == '0111111111111111111111111111111111111111111111111111111111111111'
 	assert '${u:064b}' == '0111111111111111111111111111111111111111111111111111111111111111'
 }
+
+fn test_interpolation_of_negative_numbers_padding_and_width() {
+	a := -77
+	assert '                 -77' == '${a:20}'
+	assert '                 -77' == '${a:20d}'
+	assert '                 -4d' == '${a:20x}'
+	assert '            -1001101' == '${a:20b}'
+
+	assert '-0000000000000000077' == '${a:020}'
+	assert '-0000000000000000077' == '${a:020d}'
+	assert '-000000000000000004d' == '${a:020x}'
+	assert '-0000000000001001101' == '${a:020b}'
+
+	//
+	assert '     -77' == '${a:8}'
+	assert '     -77' == '${a:8d}'
+	assert '     -4d' == '${a:8x}'
+	assert '-1001101' == '${a:8b}'
+
+	assert '-0000077' == '${a:08}'
+	assert '-0000077' == '${a:08d}'
+	assert '-1001101' == '${a:08b}'
+	assert '-000004d' == '${a:08x}'
+
+	//	
+	assert ' -77' == '${a:4}'
+	assert ' -77' == '${a:4d}'
+	assert '-1001101' == '${a:4b}'
+	assert ' -4d' == '${a:4x}'
+
+	assert '-077' == '${a:04}'
+	assert '-077' == '${a:04d}'
+	assert '-1001101' == '${a:04b}'
+	assert '-04d' == '${a:04x}'
+
+	//
+	assert '-77' == '${a:2}'
+	assert '-77' == '${a:2d}'
+	assert '-1001101' == '${a:2b}'
+	assert '-4d' == '${a:2x}'
+
+	assert '-77' == '${a:02}'
+	assert '-77' == '${a:02d}'
+	assert '-1001101' == '${a:02b}'
+	assert '-4d' == '${a:02x}'
+
+	//
+	bin0 := ~6
+	assert bin0 == -7
+	assert '-0000111' == '${bin0:08b}' // a minimum of 8 characters for the whole number, including the padding and the sign
+	assert '-0000111' == '${~6:08b}'
+	assert '    -111' == '${~6:8b}'
+
+	//
+	assert '-0000110' == '${-6:08b}'
+	assert '    -110' == '${-6:8b}'
+}
diff --git a/vlib/builtin/string_interpolation.v b/vlib/builtin/string_interpolation.v
index e7ac2ba944..fa9814ca83 100644
--- a/vlib/builtin/string_interpolation.v
+++ b/vlib/builtin/string_interpolation.v
@@ -256,12 +256,21 @@ fn (data &StrIntpData) process_str_intp_data(mut sb strings.Builder) {
 				if base == 3 {
 					base = 2
 				}
-				mut hx := strconv.format_int(d, base)
+				mut absd, mut write_minus := d, false
+				if d < 0 && pad_ch != ` ` {
+					absd = -d
+					write_minus = true
+				}
+				mut hx := strconv.format_int(absd, base)
 				if upper_case {
 					tmp := hx
 					hx = hx.to_upper()
 					tmp.free()
 				}
+				if write_minus {
+					sb.write_b(`-`)
+					bf.len0-- // compensate for the `-` above
+				}
 				if width == 0 {
 					sb.write_string(hx)
 				} else {