mirror/v
1
0
Fork 0
mirror of https://github.com/vlang/v.git synced 2023-08-10 21:13:21 +03:00
Code Issues Projects Releases Wiki Activity

all: change optional to result in most of the libraries (#16123)

Browse Source
This commit is contained in:
yuyi
2022-10-21 03:14:33 +08:00
committed by GitHub
parent 0d368562f4
commit 51f4d99399
75 changed files with 439 additions and 446 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
vlib/encoding/hex/hex.v
View File

@@ -5,7 +5,7 @@ import strings
// decode converts a hex string into an array of bytes. The expected
// input format is 2 ASCII characters for each output byte. If the provided
// string length is not a multiple of 2, an implicit `0` is prepended to it.
pub fn decode(s string) ?[]u8 {
pub fn decode(s string) ![]u8 {
mut hex_str := s
if hex_str.len >= 2 {
if s[0] == `0` && (s[1] == `x` || s[1] == `X`) {
@@ -15,24 +15,24 @@ pub fn decode(s string) ?[]u8 {
if hex_str.len == 0 {
return []u8{}
} else if hex_str.len == 1 {
return [char2nibble(hex_str[0])?]
return [char2nibble(hex_str[0])!]
} else if hex_str.len == 2 {
n1 := char2nibble(hex_str[0])?
n0 := char2nibble(hex_str[1])?
n1 := char2nibble(hex_str[0])!
n0 := char2nibble(hex_str[1])!
return [(n1 << 4) | n0]
}
// calculate the first byte depending on if hex_str.len is odd
mut val := char2nibble(hex_str[0])?
mut val := char2nibble(hex_str[0])!
if hex_str.len & 1 == 0 {
val = (val << 4) | char2nibble(hex_str[1])?
val = (val << 4) | char2nibble(hex_str[1])!
}
// set cap to hex_str.len/2 rounded up
mut bytes := []u8{len: 1, cap: (hex_str.len + 1) >> 1, init: val}
// iterate over every 2 bytes
// the start index depends on if hex_str.len is odd
for i := 2 - (hex_str.len & 1); i < hex_str.len; i += 2 {
n1 := char2nibble(hex_str[i])?
n0 := char2nibble(hex_str[i + 1])?
n1 := char2nibble(hex_str[i])!
n0 := char2nibble(hex_str[i + 1])!
bytes << (n1 << 4) | n0
}
return bytes
@@ -52,7 +52,7 @@ pub fn encode(bytes []u8) string {
}
// char2nibble converts an ASCII hex character to it's hex value
fn char2nibble(b u8) ?u8 {
fn char2nibble(b u8) !u8 {
match b {
`0`...`9` { return b - u8(`0`) }
`A`...`F` { return b - u8(`A`) + 10 }