Cxx: accept type modifiers preceding decltype keyword

Signed-off-by: Masatake YAMATO <yamato@redhat.com>
universal-ctags · Jan 7, 2023 · 1263b62 · 1263b62
1 parent 884459d
commit 1263b62
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 1 deletion.
diff --git a/Units/parser-cxx.r/more-decltypes.d/args.ctags b/Units/parser-cxx.r/more-decltypes.d/args.ctags
@@ -1 +1,2 @@
 --sort=no
+--fields-C++={properties}
diff --git a/Units/parser-cxx.r/more-decltypes.d/expected.tags b/Units/parser-cxx.r/more-decltypes.d/expected.tags
@@ -7,3 +7,7 @@ e	input.cxx	/^decltype(a) const e = 1;$/;"	v	typeref:typename:decltype(a) const
 f	input.cxx	/^typeof(a) const f = 2;$/;"	v	typeref:typename:typeof(a) const
 g	input.cxx	/^__typeof__(a) const g = 3;$/;"	v	typeref:typename:__typeof__(a) const
 g0	input.cxx	/^__typeof(a) const g0 = 3;$/;"	v	typeref:typename:__typeof(a) const
+h	input.cxx	/^static decltype(a) const h = 4;$/;"	v	typeref:typename:decltype(a) const	file:	properties:static
+i	input.cxx	/^static typeof(a) const i = 5;$/;"	v	typeref:typename:typeof(a) const	file:	properties:static
+j	input.cxx	/^static __typeof__(a) const j = 6;$/;"	v	typeref:typename:__typeof__(a) const	file:	properties:static
+j0	input.cxx	/^static __typeof(a) const j0 = 6;$/;"	v	typeref:typename:__typeof(a) const	file:	properties:static
diff --git a/Units/parser-cxx.r/more-decltypes.d/input.cxx b/Units/parser-cxx.r/more-decltypes.d/input.cxx
@@ -10,3 +10,7 @@ typeof(a) const f = 2;
 __typeof__(a) const g = 3;
 __typeof(a) const g0 = 3;
 
+static decltype(a) const h = 4;
+static typeof(a) const i = 5;
+static __typeof__(a) const j = 6;
+static __typeof(a) const j0 = 6;
diff --git a/parsers/cxx/cxx_parser_variable.c b/parsers/cxx/cxx_parser_variable.c
@@ -603,7 +603,12 @@ bool cxxParserExtractVariableDeclarations(CXXTokenChain * pChain,unsigned int uF
 						//   typeof(whatever) variable;
 						cxxTokenTypeIs(pTokenBefore,CXXTokenTypeParenthesisChain) &&
 						pTokenBefore->pPrev &&
-						!pTokenBefore->pPrev->pPrev &&
+						(!pTokenBefore->pPrev->pPrev ||
+						 (
+							 cxxTokenTypeIs(pTokenBefore->pPrev->pPrev,CXXTokenTypeKeyword) &&
+							 cxxKeywordMayAppearInVariableDeclaration(pTokenBefore->pPrev->pPrev->eKeyword)
+						 )
+						) &&
 						(
 							// macro
 							cxxTokenTypeIs(pTokenBefore->pPrev,CXXTokenTypeIdentifier) ||