Mercurial > vim
changeset 11329:c7ba89661c39 v8.0.0550
patch 8.0.0550: cannot parse some etags format tags file
commit https://github.com/vim/vim/commit/9585a1655ba0d34ea88574617112093a9bd4f2e9
Author: Bram Moolenaar <Bram@vim.org>
Date: Fri Apr 7 20:30:29 2017 +0200
patch 8.0.0550: cannot parse some etags format tags file
Problem: Some etags format tags file use 0x01, breaking the parsing.
Solution: Use 0x02 for TAG_SEP. (James McCoy, closes https://github.com/vim/vim/issues/1614)
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Fri, 07 Apr 2017 20:45:04 +0200 |
| parents | fd6f2bdf5ee6 |
| children | 27e189283e90 |
| files | src/tag.c src/testdir/test_taglist.vim src/version.c |
| diffstat | 3 files changed, 46 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/src/tag.c +++ b/src/tag.c @@ -2355,18 +2355,19 @@ parse_line: } else { -#define TAG_SEP 0x01 +#define TAG_SEP 0x02 size_t tag_fname_len = STRLEN(tag_fname); #ifdef FEAT_EMACS_TAGS size_t ebuf_len = 0; #endif /* Save the tag in a buffer. - * Use 0x01 to separate fields (Can't use NUL, because the - * hash key is terminated by NUL). - * Emacs tag: <mtt><tag_fname><0x01><ebuf><0x01><lbuf><NUL> - * other tag: <mtt><tag_fname><0x01><0x01><lbuf><NUL> - * without Emacs tags: <mtt><tag_fname><0x01><lbuf><NUL> + * Use 0x02 to separate fields (Can't use NUL because the + * hash key is terminated by NUL, or Ctrl_A because that is + * part of some Emacs tag files -- see parse_tag_line). + * Emacs tag: <mtt><tag_fname><0x02><ebuf><0x02><lbuf><NUL> + * other tag: <mtt><tag_fname><0x02><0x02><lbuf><NUL> + * without Emacs tags: <mtt><tag_fname><0x02><lbuf><NUL> * Here <mtt> is the "mtt" value plus 1 to avoid NUL. */ len = (int)tag_fname_len + (int)STRLEN(lbuf) + 3;
--- a/src/testdir/test_taglist.vim +++ b/src/testdir/test_taglist.vim @@ -19,3 +19,40 @@ func Test_taglist() bwipe endfunc +func Test_taglist_native_etags() + if !has('emacs_tags') + return + endif + call writefile([ + \ "\x0c", + \ "src/os_unix.c,13491", + \ "set_signals(\x7f1335,32699", + \ "reset_signals(\x7f1407,34136", + \ ], 'Xtags') + + set tags=Xtags + + call assert_equal([['set_signals', '1335,32699'], ['reset_signals', '1407,34136']], + \ map(taglist('set_signals'), {i, v -> [v.name, v.cmd]})) + + call delete('Xtags') +endfunc + +func Test_taglist_ctags_etags() + if !has('emacs_tags') + return + endif + call writefile([ + \ "\x0c", + \ "src/os_unix.c,13491", + \ "set_signals(void)\x7fset_signals\x011335,32699", + \ "reset_signals(void)\x7freset_signals\x011407,34136", + \ ], 'Xtags') + + set tags=Xtags + + call assert_equal([['set_signals', '1335,32699'], ['reset_signals', '1407,34136']], + \ map(taglist('set_signals'), {i, v -> [v.name, v.cmd]})) + + call delete('Xtags') +endfunc