mirror of
https://github.com/vlang/v.git
synced 2023-08-10 21:13:21 +03:00
all: change optional to result in most of the libraries (#16123)
This commit is contained in:
@@ -11,7 +11,7 @@ fn C.tinfl_decompress_mem_to_heap(source_buf voidptr, source_buf_len usize, out_
|
||||
// compresses an array of bytes based on providing flags and returns the compressed bytes in a new array
|
||||
// NB: this is a low level api, a high level implementation like zlib/gzip should be preferred
|
||||
[manualfree]
|
||||
pub fn compress(data []u8, flags int) ?[]u8 {
|
||||
pub fn compress(data []u8, flags int) ![]u8 {
|
||||
if u64(data.len) > compress.max_size {
|
||||
return error('data too large ($data.len > $compress.max_size)')
|
||||
}
|
||||
@@ -30,7 +30,7 @@ pub fn compress(data []u8, flags int) ?[]u8 {
|
||||
// decompresses an array of bytes based on providing flags and returns the decompressed bytes in a new array
|
||||
// NB: this is a low level api, a high level implementation like zlib/gzip should be preferred
|
||||
[manualfree]
|
||||
pub fn decompress(data []u8, flags int) ?[]u8 {
|
||||
pub fn decompress(data []u8, flags int) ![]u8 {
|
||||
mut out_len := usize(0)
|
||||
|
||||
address := C.tinfl_decompress_mem_to_heap(data.data, data.len, &out_len, flags)
|
||||
|
||||
@@ -11,8 +11,8 @@ import compress.deflate
|
||||
|
||||
fn main() {
|
||||
uncompressed := 'Hello world!'
|
||||
compressed := deflate.compress(uncompressed.bytes())?
|
||||
decompressed := deflate.decompress(compressed)?
|
||||
compressed := deflate.compress(uncompressed.bytes())!
|
||||
decompressed := deflate.decompress(compressed)!
|
||||
assert decompressed == uncompressed.bytes()
|
||||
}
|
||||
```
|
||||
```
|
||||
|
||||
@@ -4,12 +4,12 @@ import compress
|
||||
|
||||
// compresses an array of bytes using deflate and returns the compressed bytes in a new array
|
||||
// Example: compressed := deflate.compress(b)?
|
||||
pub fn compress(data []u8) ?[]u8 {
|
||||
pub fn compress(data []u8) ![]u8 {
|
||||
return compress.compress(data, 0)
|
||||
}
|
||||
|
||||
// decompresses an array of bytes using deflate and returns the decompressed bytes in a new array
|
||||
// Example: decompressed := deflate.decompress(b)?
|
||||
pub fn decompress(data []u8) ?[]u8 {
|
||||
pub fn decompress(data []u8) ![]u8 {
|
||||
return compress.decompress(data, 0)
|
||||
}
|
||||
|
||||
@@ -2,11 +2,11 @@ module deflate
|
||||
|
||||
const gzip_magic_numbers = [u8(0x1f), 0x8b]
|
||||
|
||||
fn test_gzip() ? {
|
||||
fn test_gzip() {
|
||||
uncompressed := 'Hello world!'
|
||||
compressed := compress(uncompressed.bytes())?
|
||||
compressed := compress(uncompressed.bytes())!
|
||||
first2 := compressed[0..2]
|
||||
assert first2 != deflate.gzip_magic_numbers
|
||||
decompressed := decompress(compressed)?
|
||||
decompressed := decompress(compressed)!
|
||||
assert decompressed == uncompressed.bytes()
|
||||
}
|
||||
|
||||
@@ -11,8 +11,8 @@ import compress.gzip
|
||||
|
||||
fn main() {
|
||||
uncompressed := 'Hello world!'
|
||||
compressed := gzip.compress(uncompressed.bytes())?
|
||||
decompressed := gzip.decompress(compressed)?
|
||||
compressed := gzip.compress(uncompressed.bytes())!
|
||||
decompressed := gzip.decompress(compressed)!
|
||||
assert decompressed == uncompressed.bytes()
|
||||
}
|
||||
```
|
||||
|
||||
@@ -8,8 +8,8 @@ import hash.crc32
|
||||
|
||||
// compresses an array of bytes using gzip and returns the compressed bytes in a new array
|
||||
// Example: compressed := gzip.compress(b)?
|
||||
pub fn compress(data []u8) ?[]u8 {
|
||||
compressed := compress.compress(data, 0)?
|
||||
pub fn compress(data []u8) ![]u8 {
|
||||
compressed := compress.compress(data, 0)!
|
||||
// header
|
||||
mut result := [
|
||||
u8(0x1f), // magic numbers (1F 8B)
|
||||
@@ -49,7 +49,7 @@ pub struct DecompressParams {
|
||||
|
||||
// decompresses an array of bytes using zlib and returns the decompressed bytes in a new array
|
||||
// Example: decompressed := gzip.decompress(b)?
|
||||
pub fn decompress(data []u8, params DecompressParams) ?[]u8 {
|
||||
pub fn decompress(data []u8, params DecompressParams) ![]u8 {
|
||||
if data.len < 18 {
|
||||
return error('data is too short, not gzip compressed?')
|
||||
} else if data[0] != 0x1f || data[1] != 0x8b {
|
||||
@@ -107,7 +107,7 @@ pub fn decompress(data []u8, params DecompressParams) ?[]u8 {
|
||||
return error('data too short')
|
||||
}
|
||||
|
||||
decompressed := compress.decompress(data[header_length..data.len - 8], 0)?
|
||||
decompressed := compress.decompress(data[header_length..data.len - 8], 0)!
|
||||
length_expected := (u32(data[data.len - 4]) << 24) | (u32(data[data.len - 3]) << 16) | (u32(data[data.len - 2]) << 8) | data[data.len - 1]
|
||||
if params.verify_length && decompressed.len != length_expected {
|
||||
return error('length verification failed, got $decompressed.len, expected $length_expected')
|
||||
|
||||
@@ -2,14 +2,14 @@ module gzip
|
||||
|
||||
import hash.crc32
|
||||
|
||||
fn test_gzip() ? {
|
||||
fn test_gzip() {
|
||||
uncompressed := 'Hello world!'
|
||||
compressed := compress(uncompressed.bytes())?
|
||||
decompressed := decompress(compressed)?
|
||||
compressed := compress(uncompressed.bytes())!
|
||||
decompressed := decompress(compressed)!
|
||||
assert decompressed == uncompressed.bytes()
|
||||
}
|
||||
|
||||
fn assert_decompress_error(data []u8, reason string) ? {
|
||||
fn assert_decompress_error(data []u8, reason string) ! {
|
||||
decompress(data) or {
|
||||
assert err.msg() == reason
|
||||
return
|
||||
@@ -17,54 +17,54 @@ fn assert_decompress_error(data []u8, reason string) ? {
|
||||
return error('did not error')
|
||||
}
|
||||
|
||||
fn test_gzip_invalid_too_short() ? {
|
||||
assert_decompress_error([]u8{}, 'data is too short, not gzip compressed?')?
|
||||
fn test_gzip_invalid_too_short() {
|
||||
assert_decompress_error([]u8{}, 'data is too short, not gzip compressed?')!
|
||||
}
|
||||
|
||||
fn test_gzip_invalid_magic_numbers() ? {
|
||||
assert_decompress_error([]u8{len: 100}, 'wrong magic numbers, not gzip compressed?')?
|
||||
fn test_gzip_invalid_magic_numbers() {
|
||||
assert_decompress_error([]u8{len: 100}, 'wrong magic numbers, not gzip compressed?')!
|
||||
}
|
||||
|
||||
fn test_gzip_invalid_compression() ? {
|
||||
fn test_gzip_invalid_compression() {
|
||||
mut data := []u8{len: 100}
|
||||
data[0] = 0x1f
|
||||
data[1] = 0x8b
|
||||
assert_decompress_error(data, 'gzip data is not compressed with DEFLATE')?
|
||||
assert_decompress_error(data, 'gzip data is not compressed with DEFLATE')!
|
||||
}
|
||||
|
||||
fn test_gzip_with_ftext() ? {
|
||||
fn test_gzip_with_ftext() {
|
||||
uncompressed := 'Hello world!'
|
||||
mut compressed := compress(uncompressed.bytes())?
|
||||
mut compressed := compress(uncompressed.bytes())!
|
||||
compressed[4] |= 0b0000_0001 // FTEXT
|
||||
decompressed := decompress(compressed)?
|
||||
decompressed := decompress(compressed)!
|
||||
assert decompressed == uncompressed.bytes()
|
||||
}
|
||||
|
||||
fn test_gzip_with_fname() ? {
|
||||
fn test_gzip_with_fname() {
|
||||
uncompressed := 'Hello world!'
|
||||
mut compressed := compress(uncompressed.bytes())?
|
||||
mut compressed := compress(uncompressed.bytes())!
|
||||
compressed[4] |= 0b0000_1000
|
||||
compressed.insert(10, `h`)
|
||||
compressed.insert(11, `i`)
|
||||
compressed.insert(12, 0x00)
|
||||
decompressed := decompress(compressed)?
|
||||
decompressed := decompress(compressed)!
|
||||
assert decompressed == uncompressed.bytes()
|
||||
}
|
||||
|
||||
fn test_gzip_with_fcomment() ? {
|
||||
fn test_gzip_with_fcomment() {
|
||||
uncompressed := 'Hello world!'
|
||||
mut compressed := compress(uncompressed.bytes())?
|
||||
mut compressed := compress(uncompressed.bytes())!
|
||||
compressed[4] |= 0b0001_0000
|
||||
compressed.insert(10, `h`)
|
||||
compressed.insert(11, `i`)
|
||||
compressed.insert(12, 0x00)
|
||||
decompressed := decompress(compressed)?
|
||||
decompressed := decompress(compressed)!
|
||||
assert decompressed == uncompressed.bytes()
|
||||
}
|
||||
|
||||
fn test_gzip_with_fname_fcomment() ? {
|
||||
fn test_gzip_with_fname_fcomment() {
|
||||
uncompressed := 'Hello world!'
|
||||
mut compressed := compress(uncompressed.bytes())?
|
||||
mut compressed := compress(uncompressed.bytes())!
|
||||
compressed[4] |= 0b0001_1000
|
||||
compressed.insert(10, `h`)
|
||||
compressed.insert(11, `i`)
|
||||
@@ -72,63 +72,63 @@ fn test_gzip_with_fname_fcomment() ? {
|
||||
compressed.insert(10, `h`)
|
||||
compressed.insert(11, `i`)
|
||||
compressed.insert(12, 0x00)
|
||||
decompressed := decompress(compressed)?
|
||||
decompressed := decompress(compressed)!
|
||||
assert decompressed == uncompressed.bytes()
|
||||
}
|
||||
|
||||
fn test_gzip_with_fextra() ? {
|
||||
fn test_gzip_with_fextra() {
|
||||
uncompressed := 'Hello world!'
|
||||
mut compressed := compress(uncompressed.bytes())?
|
||||
mut compressed := compress(uncompressed.bytes())!
|
||||
compressed[4] |= 0b0000_0100
|
||||
compressed.insert(10, 2)
|
||||
compressed.insert(11, `h`)
|
||||
compressed.insert(12, `i`)
|
||||
decompressed := decompress(compressed)?
|
||||
decompressed := decompress(compressed)!
|
||||
assert decompressed == uncompressed.bytes()
|
||||
}
|
||||
|
||||
fn test_gzip_with_hcrc() ? {
|
||||
fn test_gzip_with_hcrc() {
|
||||
uncompressed := 'Hello world!'
|
||||
mut compressed := compress(uncompressed.bytes())?
|
||||
mut compressed := compress(uncompressed.bytes())!
|
||||
compressed[4] |= 0b0000_0010
|
||||
checksum := crc32.sum(compressed[..10])
|
||||
compressed.insert(10, u8(checksum >> 24))
|
||||
compressed.insert(11, u8(checksum >> 16))
|
||||
compressed.insert(12, u8(checksum >> 8))
|
||||
compressed.insert(13, u8(checksum))
|
||||
decompressed := decompress(compressed)?
|
||||
decompressed := decompress(compressed)!
|
||||
assert decompressed == uncompressed.bytes()
|
||||
}
|
||||
|
||||
fn test_gzip_with_invalid_hcrc() ? {
|
||||
fn test_gzip_with_invalid_hcrc() {
|
||||
uncompressed := 'Hello world!'
|
||||
mut compressed := compress(uncompressed.bytes())?
|
||||
mut compressed := compress(uncompressed.bytes())!
|
||||
compressed[4] |= 0b0000_0010
|
||||
checksum := crc32.sum(compressed[..10])
|
||||
compressed.insert(10, u8(checksum >> 24))
|
||||
compressed.insert(11, u8(checksum >> 16))
|
||||
compressed.insert(12, u8(checksum >> 8))
|
||||
compressed.insert(13, u8(checksum + 1))
|
||||
assert_decompress_error(compressed, 'header checksum verification failed')?
|
||||
assert_decompress_error(compressed, 'header checksum verification failed')!
|
||||
}
|
||||
|
||||
fn test_gzip_with_invalid_checksum() ? {
|
||||
fn test_gzip_with_invalid_checksum() {
|
||||
uncompressed := 'Hello world!'
|
||||
mut compressed := compress(uncompressed.bytes())?
|
||||
mut compressed := compress(uncompressed.bytes())!
|
||||
compressed[compressed.len - 5] += 1
|
||||
assert_decompress_error(compressed, 'checksum verification failed')?
|
||||
assert_decompress_error(compressed, 'checksum verification failed')!
|
||||
}
|
||||
|
||||
fn test_gzip_with_invalid_length() ? {
|
||||
fn test_gzip_with_invalid_length() {
|
||||
uncompressed := 'Hello world!'
|
||||
mut compressed := compress(uncompressed.bytes())?
|
||||
mut compressed := compress(uncompressed.bytes())!
|
||||
compressed[compressed.len - 1] += 1
|
||||
assert_decompress_error(compressed, 'length verification failed, got 12, expected 13')?
|
||||
assert_decompress_error(compressed, 'length verification failed, got 12, expected 13')!
|
||||
}
|
||||
|
||||
fn test_gzip_with_invalid_flags() ? {
|
||||
fn test_gzip_with_invalid_flags() {
|
||||
uncompressed := 'Hello world!'
|
||||
mut compressed := compress(uncompressed.bytes())?
|
||||
mut compressed := compress(uncompressed.bytes())!
|
||||
compressed[4] |= 0b1000_0000
|
||||
assert_decompress_error(compressed, 'reserved flags are set, unsupported field detected')?
|
||||
assert_decompress_error(compressed, 'reserved flags are set, unsupported field detected')!
|
||||
}
|
||||
|
||||
@@ -10,8 +10,8 @@ import compress.zlib
|
||||
|
||||
fn main() {
|
||||
uncompressed := 'Hello world!'
|
||||
compressed := zlib.compress(uncompressed.bytes())?
|
||||
decompressed := zlib.decompress(compressed)?
|
||||
compressed := zlib.compress(uncompressed.bytes())!
|
||||
decompressed := zlib.decompress(compressed)!
|
||||
assert decompressed == uncompressed.bytes()
|
||||
}
|
||||
```
|
||||
|
||||
@@ -4,14 +4,14 @@ import compress
|
||||
|
||||
// compresses an array of bytes using zlib and returns the compressed bytes in a new array
|
||||
// Example: compressed := zlib.compress(b)?
|
||||
pub fn compress(data []u8) ?[]u8 {
|
||||
pub fn compress(data []u8) ![]u8 {
|
||||
// flags = TDEFL_WRITE_ZLIB_HEADER (0x01000)
|
||||
return compress.compress(data, 0x01000)
|
||||
}
|
||||
|
||||
// decompresses an array of bytes using zlib and returns the decompressed bytes in a new array
|
||||
// Example: decompressed := zlib.decompress(b)?
|
||||
pub fn decompress(data []u8) ?[]u8 {
|
||||
pub fn decompress(data []u8) ![]u8 {
|
||||
// flags = TINFL_FLAG_PARSE_ZLIB_HEADER (0x1)
|
||||
return compress.decompress(data, 0x1)
|
||||
}
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
module zlib
|
||||
|
||||
fn test_zlib() ? {
|
||||
fn test_zlib() {
|
||||
uncompressed := 'Hello world!'
|
||||
compressed := compress(uncompressed.bytes())?
|
||||
decompressed := decompress(compressed)?
|
||||
compressed := compress(uncompressed.bytes())!
|
||||
decompressed := decompress(compressed)!
|
||||
assert decompressed == uncompressed.bytes()
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user