Cxx: don't set "nth:" fields in upper layers of parsers

The lower layer of tagging sets the fields. Signed-off-by: Masatake YAMATO <yamato@redhat.com>
universal-ctags · Nov 30, 2022 · b9249a8 · b9249a8
1 parent 8707721
commit b9249a8
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/parsers/cxx/cxx_parser_function.c b/parsers/cxx/cxx_parser_function.c
@@ -1925,7 +1925,6 @@ void cxxParserEmitFunctionParameterTags(CXXTypedVariableSet * pInfo)
 		} else {
 			pTypeName = NULL;
 		}
-		tag->extensionFields.nth = i;
 
 		tag->isFileScope = true;
 

diff --git a/parsers/cxx/cxx_parser_template.c b/parsers/cxx/cxx_parser_template.c
@@ -823,8 +823,6 @@ void cxxParserEmitTemplateParameterTags(void)
 		if(!tag)
 			continue;
 
-		tag->extensionFields.nth = (short)i;
-
 		CXXToken * pTypeToken = cxxTagCheckAndSetTypeField(
 				g_cxx.oTemplateParameters.aTypeStarts[i],
 				g_cxx.oTemplateParameters.aTypeEnds[i]

diff --git a/parsers/cxx/cxx_parser_typedef.c b/parsers/cxx/cxx_parser_typedef.c
@@ -442,7 +442,8 @@ void cxxParserExtractTypedef(
 			if(bGotTemplate)
 				cxxTagHandleTemplateFields();
 
-			cxxTagCommit(NULL);
+			int iCorkQueueIndex = cxxTagCommit(NULL);
+			cxxTagUseTokenAsPartOfDefTag(iCorkQueueIndex, t);
 
 			if (
 					bGotTemplate &&

diff --git a/parsers/cxx/cxx_parser_variable.c b/parsers/cxx/cxx_parser_variable.c
@@ -767,6 +767,7 @@ bool cxxParserExtractVariableDeclarations(CXXTokenChain * pChain,unsigned int uF
 				cxxTagHandleTemplateFields();
 
 			iCorkIndex = cxxTagCommit(&iCorkIndexFQ);
+			cxxTagUseTokenAsPartOfDefTag(iCorkIndexFQ, pIdentifier);
 
 			if(pTypeToken)
 				cxxTokenDestroy(pTypeToken);

diff --git a/parsers/cxx/cxx_tag.c b/parsers/cxx/cxx_tag.c
@@ -298,7 +298,8 @@ tagEntryInfo * cxxTagBegin(unsigned int uKind,CXXToken * pToken)
 		g_oCXXTag.extensionFields.scopeIndex = cxxScopeGetDefTag();
 		if (g_oCXXTag.extensionFields.scopeIndex != CORK_NIL)
 		{
-			if (uKind == CXXTagKindMEMBER || uKind == CXXTagKindENUMERATOR)
+			if (uKind == CXXTagKindMEMBER || uKind == CXXTagKindENUMERATOR
+				|| uKind == CXXTagKindPARAMETER || CXXTagCPPKindTEMPLATEPARAM)
 				g_oCXXTag.extensionFields.nth =
 					(short) countEntriesInScope(g_oCXXTag.extensionFields.scopeIndex,
 												true,