Branch: refs/heads/master Author: Colomban Wendling ban@herbesfolles.org Committer: Colomban Wendling ban@herbesfolles.org Date: Thu, 25 Dec 2014 18:54:12 UTC Commit: 08568b11f587000e7226694a22300aa79db473de https://github.com/geany/geany/commit/08568b11f587000e7226694a22300aa79db473...
Log Message: ----------- Merge PR#393 from 'c/keyword-types'
Fix parsing typedefs to size_t (C/C++/D) and wchar_t (C/D).
Modified Paths: -------------- tagmanager/ctags/c.c tests/ctags/Makefile.am tests/ctags/size_t_wchar_t_alias.d tests/ctags/size_t_wchar_t_alias.d.tags tests/ctags/size_t_wchar_t_typedef.c tests/ctags/size_t_wchar_t_typedef.c.tags
Modified: tagmanager/ctags/c.c 4 lines changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -477,7 +477,7 @@ static const keywordDesc KeywordTable [] = { { "short", KEYWORD_SHORT, { 1, 1, 1, 1, 0, 1, 1 } }, { "signal", KEYWORD_SIGNAL, { 0, 0, 0, 0, 0, 1, 0 } }, { "signed", KEYWORD_SIGNED, { 1, 1, 0, 0, 0, 0, 0 } }, - { "size_t", KEYWORD_SIZE_T, { 1, 1, 0, 0, 0, 1, 1 } }, + { "size_t", KEYWORD_SIZE_T, { 0, 0, 0, 0, 0, 1, 0 } }, { "state", KEYWORD_STATE, { 0, 0, 0, 0, 1, 0, 0 } }, { "static", KEYWORD_STATIC, { 1, 1, 1, 1, 1, 1, 1 } }, { "static_assert", KEYWORD_STATIC_ASSERT, { 0, 1, 0, 0, 0, 0, 0 } }, @@ -506,7 +506,7 @@ static const keywordDesc KeywordTable [] = { { "virtual", KEYWORD_VIRTUAL, { 0, 1, 1, 0, 1, 1, 0 } }, { "void", KEYWORD_VOID, { 1, 1, 1, 1, 1, 1, 1 } }, { "volatile", KEYWORD_VOLATILE, { 1, 1, 1, 1, 0, 0, 1 } }, - { "wchar_t", KEYWORD_WCHAR_T, { 1, 1, 1, 0, 0, 0, 1 } }, + { "wchar_t", KEYWORD_WCHAR_T, { 0, 1, 1, 0, 0, 0, 0 } }, { "weak", KEYWORD_WEAK, { 0, 0, 0, 0, 0, 1, 0 } }, { "while", KEYWORD_WHILE, { 1, 1, 1, 1, 0, 1, 1 } } };
Modified: tests/ctags/Makefile.am 2 lines changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -254,6 +254,8 @@ test_sources = \ simple.rb \ simple.sh \ simple.tcl \ + size_t_wchar_t_alias.d \ + size_t_wchar_t_typedef.c \ spurious_label_tags.c \ sql_single_quote.sql \ square_parens.f90 \
Modified: tests/ctags/size_t_wchar_t_alias.d 3 lines changed, 3 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,3 @@ + +alias size_t = int; +alias wchar_t = int;
Modified: tests/ctags/size_t_wchar_t_alias.d.tags 3 lines changed, 3 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,3 @@ +# format=tagmanager +size_t�4096�0 +wchar_t�4096�0
Modified: tests/ctags/size_t_wchar_t_typedef.c 3 lines changed, 3 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,3 @@ + +typedef int size_t; +typedef int wchar_t;
Modified: tests/ctags/size_t_wchar_t_typedef.c.tags 3 lines changed, 3 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,3 @@ +# format=tagmanager +size_t�4096�0�int +wchar_t�4096�0�int
-------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).