diff --git a/vlib/builtin/string.v b/vlib/builtin/string.v index 23efe60de3..65119860b1 100644 --- a/vlib/builtin/string.v +++ b/vlib/builtin/string.v @@ -539,6 +539,36 @@ pub fn (s string) u64() u64 { return strconv.common_parse_uint(s, 0, 64, false, false) or { 0 } } +// `parse_int` interprets a string s in the given base (0, 2 to 36) and +// bit size (0 to 64) and returns the corresponding value i. +// +// If the base argument is 0, the true base is implied by the string's +// prefix: 2 for "0b", 8 for "0" or "0o", 16 for "0x", and 10 otherwise. +// Also, for argument base 0 only, underscore characters are permitted +// as defined by the Go syntax for integer literals. +// +// The bitSize argument specifies the integer type +// that the result must fit into. Bit sizes 0, 8, 16, 32, and 64 +// correspond to int, int8, int16, int32, and int64. +// If bitSize is below 0 or above 64, an error is returned. +// +// This method directly exposes the `parse_uint` function from `strconv` +// as a method on `string`. For more advanced features, +// consider calling `strconv.common_parse_uint` directly. +// Example: +pub fn (s string) parse_uint(_base int, _bit_size int) ?u64 { + return strconv.parse_uint(s, _base, _bit_size) +} + +// `parse_uint` is like `parse_int` but for unsigned numbers +// +// This method directly exposes the `parse_int` function from `strconv` +// as a method on `string`. For more advanced features, +// consider calling `strconv.common_parse_int` directly. +pub fn (s string) parse_int(_base int, _bit_size int) ?i64 { + return strconv.parse_int(s, _base, _bit_size) +} + [direct_array_access] fn (s string) == (a string) bool { if s.str == 0 { diff --git a/vlib/builtin/string_int_test.v b/vlib/builtin/string_int_test.v index 756bdbe00b..ff45d3e6bf 100644 --- a/vlib/builtin/string_int_test.v +++ b/vlib/builtin/string_int_test.v @@ -278,7 +278,7 @@ fn test_interpolation_of_negative_numbers_padding_and_width() { assert '-1001101' == '${a:08b}' assert '-000004d' == '${a:08x}' - // + // assert ' -77' == '${a:4}' assert ' -77' == '${a:4d}' assert '-1001101' == '${a:4b}' @@ -311,3 +311,25 @@ fn test_interpolation_of_negative_numbers_padding_and_width() { assert '-0000110' == '${-6:08b}' assert ' -110' == '${-6:8b}' } + +fn test_parse() { + assert i64(1) == '1'.parse_int(0, 8) or { 0 } + assert i64(1) == '0b01'.parse_int(0, 8) or { 0 } + assert i64(1) == '01'.parse_int(0, 8) or { 0 } + assert i64(1) == '0o01'.parse_int(0, 8) or { 0 } + assert i64(1) == '0x01'.parse_int(0, 8) or { 0 } + assert i64(1) == '1'.parse_int(2, 8) or { 0 } + assert i64(1) == '1'.parse_int(8, 8) or { 0 } + assert i64(1) == '1'.parse_int(10, 8) or { 0 } + assert i64(1) == '1'.parse_int(16, 8) or { 0 } + + assert u64(1) == '1'.parse_uint(0, 8) or { 0 } + assert u64(1) == '0b01'.parse_uint(0, 8) or { 0 } + assert u64(1) == '01'.parse_uint(0, 8) or { 0 } + assert u64(1) == '0o01'.parse_uint(0, 8) or { 0 } + assert u64(1) == '0x01'.parse_uint(0, 8) or { 0 } + assert u64(1) == '1'.parse_uint(2, 8) or { 0 } + assert u64(1) == '1'.parse_uint(8, 8) or { 0 } + assert u64(1) == '1'.parse_uint(10, 8) or { 0 } + assert u64(1) == '1'.parse_uint(16, 8) or { 0 } +}