vieter-v
/
v
2
0
Fork 0
Code Issues Pull Requests Releases Activity

strconv: add a small performance optimisation

pull/12714/head
Delyan Angelov 2021-12-03 19:52:14 +02:00
parent 365b46cad3
commit 33163238e7
No known key found for this signature in database
GPG Key ID: 66886C0F12D595ED
2 changed files with 26 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
vlib/builtin/string_interpolation.v
View File

@ -154,14 +154,14 @@ pub fn get_str_intp_u32_format(fmt_type StrIntpType, in_width int, in_precision
// convert from struct to formated string // convert from struct to formated string
[manualfree] [manualfree]
fn (data StrIntpData) get_fmt_format(mut sb strings.Builder) { fn (data &StrIntpData) process_str_intp_data(mut sb strings.Builder) {
x := data.fmt x := data.fmt
typ := StrIntpType(x & 0x1F) typ := StrIntpType(x & 0x1F)
allign := int((x >> 5) & 0x01) allign := int((x >> 5) & 0x01)
upper_case := if ((x >> 7) & 0x01) > 0 { true } else { false } upper_case := ((x >> 7) & 0x01) > 0
sign := int((x >> 8) & 0x01) sign := int((x >> 8) & 0x01)
precision := int((x >> 9) & 0x7F) precision := int((x >> 9) & 0x7F)
tail_zeros := if ((x >> 16) & 0x01) > 0 { true } else { false } tail_zeros := ((x >> 16) & 0x01) > 0
width := int(i16((x >> 17) & 0x3FF)) width := int(i16((x >> 17) & 0x3FF))
mut base := int(x >> 27) & 0xF mut base := int(x >> 27) & 0xF
fmt_pad_ch := byte((x >> 31) & 0xFF) fmt_pad_ch := byte((x >> 31) & 0xFF)
@ -187,7 +187,7 @@ fn (data StrIntpData) get_fmt_format(mut sb strings.Builder) {
len0_set := if width > 0 { width } else { -1 } len0_set := if width > 0 { width } else { -1 }
len1_set := if precision == 0x7F { -1 } else { precision } len1_set := if precision == 0x7F { -1 } else { precision }
sign_set := if sign == 1 { true } else { false } sign_set := sign == 1
mut bf := strconv.BF_param{ mut bf := strconv.BF_param{
pad_ch: pad_ch // padding char pad_ch: pad_ch // padding char
@ -651,22 +651,19 @@ pub:
} }
// interpolation function // interpolation function
[manualfree] [direct_array_access; manualfree]
pub fn str_intp(data_len int, in_data voidptr) string { pub fn str_intp(data_len int, in_data voidptr) string {
mut res := strings.new_builder(256) mut res := strings.new_builder(256)
unsafe { input_base := &StrIntpData(in_data)
mut i := 0 for i := 0; i < data_len; i++ {
for i < data_len { data := unsafe { &(input_base[i]) }
data := &StrIntpData(&byte(in_data) + (int(sizeof(StrIntpData)) * i)) // avoid empty strings
// avoid empty strings if data.str.len != 0 {
if data.str.len != 0 { res.write_string(data.str)
res.write_string(data.str) }
} // skip empty data
// skip empty data if data.fmt != 0 {
if data.fmt != 0 { data.process_str_intp_data(mut res)
data.get_fmt_format(mut &res)
}
i++
} }
} }
ret := res.str() ret := res.str()

16
vlib/strconv/number_to_base.c.v
View File

@ -4,7 +4,7 @@ const base_digits = '0123456789abcdefghijklmnopqrstuvwxyz'
// format_int returns the string representation of the number n in base `radix` // format_int returns the string representation of the number n in base `radix`
// for digit values > 10, this function uses the small latin leters a-z. // for digit values > 10, this function uses the small latin leters a-z.
[manualfree] [direct_array_access; manualfree]
pub fn format_int(n i64, radix int) string { pub fn format_int(n i64, radix int) string {
unsafe { unsafe {
if radix < 2 || radix > 36 { if radix < 2 || radix > 36 {
@ -14,22 +14,28 @@ pub fn format_int(n i64, radix int) string {
return '0' return '0'
} }
mut n_copy := n mut n_copy := n
mut sign := '' mut have_minus := false
if n < 0 { if n < 0 {
sign = '-' have_minus = true
n_copy = -n_copy n_copy = -n_copy
} }
mut res := '' mut res := ''
for n_copy != 0 { for n_copy != 0 {
tmp_0 := res tmp_0 := res
tmp_1 := strconv.base_digits[n_copy % radix].ascii_str() bdx := int(n_copy % radix)
tmp_1 := strconv.base_digits[bdx].ascii_str()
res = tmp_1 + res res = tmp_1 + res
tmp_0.free() tmp_0.free()
tmp_1.free() tmp_1.free()
// res = base_digits[n_copy % radix].ascii_str() + res // res = base_digits[n_copy % radix].ascii_str() + res
n_copy /= radix n_copy /= radix
} }
return '$sign$res' if have_minus {
final_res := '-' + res
res.free()
return final_res
}
return res
} }
} }