builtin: fix {-7:08b} (interpolation of negative numbers with 0 padding), add tests

pull/12719/head
Delyan Angelov 2021-12-04 13:04:51 +02:00
parent 89c08c6292
commit d59aa14b26
No known key found for this signature in database
GPG Key ID: 66886C0F12D595ED
2 changed files with 67 additions and 1 deletions

View File

@ -254,3 +254,60 @@ fn test_binary64() {
assert '${i:064b}' == '0111111111111111111111111111111111111111111111111111111111111111' assert '${i:064b}' == '0111111111111111111111111111111111111111111111111111111111111111'
assert '${u: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}'
}

View File

@ -256,12 +256,21 @@ fn (data &StrIntpData) process_str_intp_data(mut sb strings.Builder) {
if base == 3 { if base == 3 {
base = 2 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 { if upper_case {
tmp := hx tmp := hx
hx = hx.to_upper() hx = hx.to_upper()
tmp.free() tmp.free()
} }
if write_minus {
sb.write_b(`-`)
bf.len0-- // compensate for the `-` above
}
if width == 0 { if width == 0 {
sb.write_string(hx) sb.write_string(hx)
} else { } else {