mirrors/v
1
0
Fork 0
mirror of https://github.com/vlang/v.git synced 2025-09-14 06:52:36 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

builtin: fix interpolation bug for ${x:g/G}, where x is a zero or an infinity (#10271)

Browse source
This commit is contained in:
penguindark 2021-05-30 18:30:18 +02:00 • committed by GitHub
parent aa861d1cac
commit 1343787009
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 98 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

62
vlib/builtin/string_interpolation.v
View file

@ -450,6 +450,37 @@ fn (data StrIntpData) get_fmt_format(mut sb strings.Builder) {
sb.write_string(f)
f.free()
} else {
// Manage +/-0
if data.d.d_f32 == strconv.single_plus_zero {
tmp_str := '0'
strconv.format_str_sb(tmp_str, bf, mut sb)
tmp_str.free()
return
}
if data.d.d_f32 == strconv.single_minus_zero {
tmp_str := '-0'
strconv.format_str_sb(tmp_str, bf, mut sb)
tmp_str.free()
return
}
// Manage +/-INF
if data.d.d_f32 == strconv.single_plus_infinity {
mut tmp_str := '+inf'
if upper_case {
tmp_str = '+INF'
}
strconv.format_str_sb(tmp_str, bf, mut sb)
tmp_str.free()
}
if data.d.d_f32 == strconv.single_minus_infinity {
mut tmp_str := '-inf'
if upper_case {
tmp_str = '-INF'
}
strconv.format_str_sb(tmp_str, bf, mut sb)
tmp_str.free()
}
if data.d.d_f32 < 0 {
bf.positive = false
}
@ -487,6 +518,37 @@ fn (data StrIntpData) get_fmt_format(mut sb strings.Builder) {
sb.write_string(f)
f.free()
} else {
// Manage +/-0
if data.d.d_f64 == strconv.double_plus_zero {
tmp_str := '0'
strconv.format_str_sb(tmp_str, bf, mut sb)
tmp_str.free()
return
}
if data.d.d_f64 == strconv.double_minus_zero {
tmp_str := '-0'
strconv.format_str_sb(tmp_str, bf, mut sb)
tmp_str.free()
return
}
// Manage +/-INF
if data.d.d_f64 == strconv.double_plus_infinity {
mut tmp_str := '+inf'
if upper_case {
tmp_str = '+INF'
}
strconv.format_str_sb(tmp_str, bf, mut sb)
tmp_str.free()
}
if data.d.d_f64 == strconv.double_minus_infinity {
mut tmp_str := '-inf'
if upper_case {
tmp_str = '-INF'
}
strconv.format_str_sb(tmp_str, bf, mut sb)
tmp_str.free()
}
if data.d.d_f64 < 0 {
bf.positive = false
}