IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:8.1.0765: string format of a Blob can't be parsed back

Browse Source 
Problem:    String format of a Blob can't be parsed back.
Solution:   Use 0z format.
4131fd5509
This commit is contained in:
Sean Dewar 2020-12-02 17:24:15 +00:00
parent 0eadd7e5fd
commit 6a02ccc222
No known key found for this signature in database
GPG Key ID: 08CC2C83AD41B581
3 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/nvim/eval.c
View File

@ -4089,6 +4089,9 @@ static int eval7(
if (blob != NULL) {
ga_append(&blob->bv_ga, (hex2nr(*bp) << 4) + hex2nr(*(bp + 1)));
}
if (bp[2] == '.' && ascii_isxdigit(bp[3])) {
bp++;
}
}
if (blob != NULL) {
tv_blob_set_ret(rettv, blob);

16
src/nvim/eval/encode.c
View File

@ -324,20 +324,22 @@ int encode_read_from_list(ListReaderState *const state, char *const buf,
const blob_T *const blob_ = (blob); \
const int len_ = (len); \
if (len_ == 0) { \
ga_concat(gap, "[]"); \
ga_concat(gap, "0z"); \
} else { \
ga_grow(gap, 1 + len_ * 5); \
ga_append(gap, '['); \
/* Allocate space for "0z", the two hex chars per byte, and a */ \
/* "." separator after every eight hex chars. */ \
/* Example: "0z00112233.44556677.8899" */ \
ga_grow(gap, 2 + 2 * len_ + (len_ - 1) / 4); \
ga_concat(gap, "0z"); \
char numbuf[NUMBUFLEN]; \
for (int i_ = 0; i_ < len_; i_++) { \
if (i_ > 0) { \
ga_append(gap, ','); \
if (i_ > 0 && (i_ & 3) == 0) { \
ga_append(gap, '.'); \
} \
vim_snprintf((char *)numbuf, ARRAY_SIZE(numbuf), "0x%02X", \
vim_snprintf((char *)numbuf, ARRAY_SIZE(numbuf), "%02X", \
(int)tv_blob_get(blob_, i_)); \
ga_concat(gap, numbuf); \
} \
ga_append(gap, ']'); \
} \
} while (0)

15
src/nvim/testdir/test_blob.vim
View File

@ -26,6 +26,12 @@ func Test_blob_create()
call assert_fails('let b = 0z12345', 'E973:')
call assert_equal(0z, v:_null_blob)
let b = 0z001122.33445566.778899.aabbcc.dd
call assert_equal(0z00112233445566778899aabbccdd, b)
call assert_fails('let b = 0z1.1')
call assert_fails('let b = 0z.')
call assert_fails('let b = 0z001122.')
endfunc
" assignment to a blob
@ -91,10 +97,13 @@ func Test_blob_get()
endfunc
func Test_blob_to_string()
let b = 0zDEADBEEF
call assert_equal('[0xDE,0xAD,0xBE,0xEF]', string(b))
let b = 0z00112233445566778899aabbccdd
call assert_equal('0z00112233.44556677.8899AABB.CCDD', string(b))
call assert_equal(b, eval(string(b)))
call remove(b, 4, -1)
call assert_equal('0z00112233', string(b))
call remove(b, 0, 3)
call assert_equal('[]', string(b))
call assert_equal('0z', string(b))
endfunc
func Test_blob_compare()