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

eval.c: ga_concat_esc() #7357

Browse Source 
vim-patch:2368917d8f0c0a997eac7a51ddfaa748dc528392
closes #7256
This commit is contained in:
Andrew Ferreira 2017-10-07 06:45:23 -04:00 committed by Justin M. Keyes
parent 01487d4385
commit a4019bc9f6
1 changed files with 37 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/nvim/eval.c
View File

@ -6733,6 +6733,39 @@ static void prepare_assert_error(garray_T *gap)
} }
} }
// Append "str" to "gap", escaping unprintable characters.
// Changes NL to \n, CR to \r, etc.
static void ga_concat_esc(garray_T *gap, char_u *str)
{
char_u *p;
char_u buf[NUMBUFLEN];
if (str == NULL) {
ga_concat(gap, (char_u *)"NULL");
return;
}
for (p = str; *p != NUL; p++) {
switch (*p) {
case BS: ga_concat(gap, (char_u *)"\\b"); break;
case ESC: ga_concat(gap, (char_u *)"\\e"); break;
case FF: ga_concat(gap, (char_u *)"\\f"); break;
case NL: ga_concat(gap, (char_u *)"\\n"); break;
case TAB: ga_concat(gap, (char_u *)"\\t"); break;
case CAR: ga_concat(gap, (char_u *)"\\r"); break;
case '\\': ga_concat(gap, (char_u *)"\\\\"); break;
default:
if (*p < ' ') {
vim_snprintf((char *)buf, NUMBUFLEN, "\\x%02x", *p);
ga_concat(gap, buf);
} else {
ga_append(gap, *p);
}
break;
}
}
}
// Fill "gap" with information about an assert error. // Fill "gap" with information about an assert error.
static void fill_assert_error(garray_T *gap, typval_T *opt_msg_tv, static void fill_assert_error(garray_T *gap, typval_T *opt_msg_tv,
char_u *exp_str, typval_T *exp_tv, char_u *exp_str, typval_T *exp_tv,
@ -6753,11 +6786,11 @@ static void fill_assert_error(garray_T *gap, typval_T *opt_msg_tv,
ga_concat(gap, (char_u *)"Expected "); ga_concat(gap, (char_u *)"Expected ");
} }
if (exp_str == NULL) { if (exp_str == NULL) {
tofree = (char_u *) encode_tv2string(exp_tv, NULL); tofree = (char_u *)encode_tv2string(exp_tv, NULL);
ga_concat(gap, tofree); ga_concat_esc(gap, tofree);
xfree(tofree); xfree(tofree);
} else { } else {
ga_concat(gap, exp_str); ga_concat_esc(gap, exp_str);
} }
if (atype != ASSERT_NOTEQUAL) { if (atype != ASSERT_NOTEQUAL) {
if (atype == ASSERT_MATCH) { if (atype == ASSERT_MATCH) {
@ -6768,7 +6801,7 @@ static void fill_assert_error(garray_T *gap, typval_T *opt_msg_tv,
ga_concat(gap, (char_u *)" but got "); ga_concat(gap, (char_u *)" but got ");
} }
tofree = (char_u *)encode_tv2string(got_tv, NULL); tofree = (char_u *)encode_tv2string(got_tv, NULL);
ga_concat(gap, tofree); ga_concat_esc(gap, tofree);
xfree(tofree); xfree(tofree);
} }
} }