Cxx: fill "nth:" field of tags of member and enumerator kinds

Signed-off-by: Masatake YAMATO <[email protected]>

Author: masatake

Units/parser-cxx.r/field-nth.d/expected.tags

@@ -8,3 +8,11 @@ C	input.h	/^class C {};$/;"	c	template:<class T1,class T2,int I>
 T1	input.h	/^template<class T1, class T2, int I>$/;"	Z	class:C	typeref:meta:class	nth:0
 T2	input.h	/^template<class T1, class T2, int I>$/;"	Z	class:C	typeref:meta:class	nth:1
 I	input.h	/^template<class T1, class T2, int I>$/;"	Z	class:C	typeref:typename:int	nth:2
+D	input.h	/^class D {$/;"	c
+i	input.h	/^	int i, j;$/;"	m	class:D	typeref:typename:int	nth:0
+j	input.h	/^	int i, j;$/;"	m	class:D	typeref:typename:int	nth:1
+c	input.h	/^	char c;$/;"	m	class:D	typeref:typename:char	nth:2
+color	input.h	/^enum color {$/;"	g
+red	input.h	/^	red, green, blue,$/;"	e	enum:color	nth:0
+green	input.h	/^	red, green, blue,$/;"	e	enum:color	nth:1
+blue	input.h	/^	red, green, blue,$/;"	e	enum:color	nth:2

Units/parser-cxx.r/field-nth.d/input.h

@@ -3,3 +3,12 @@ inline void f(int x, int y) {}
 
 template<class T1, class T2, int I>
 class C {};
+
+class D {
+	int i, j;
+	char c;
+};
+
+enum color {
+	red, green, blue,
+};

parsers/cxx/cxx_tag.c

@@ -260,6 +260,14 @@ void cxxTagUseTokensInRangeAsPartOfDefTags(int iCorkIndex, CXXToken * pFrom, CXX
 	}
 }
 
+static bool countSameKindEntry(int corkIndex,
+							   tagEntryInfo * entry,
+							   void * data)
+{
+	unsigned int *uKind = data;
+	return (entry->kindIndex == *uKind);
+}
+
 tagEntryInfo * cxxTagBegin(unsigned int uKind,CXXToken * pToken)
 {
 	kindDefinition * pKindDefinitions = g_cxx.pKindDefinitions;
@@ -288,6 +296,14 @@ tagEntryInfo * cxxTagBegin(unsigned int uKind,CXXToken * pToken)
 		g_oCXXTag.extensionFields.scopeName = cxxScopeGetFullName();
 		// scopeIndex is used in the parser internally.
 		g_oCXXTag.extensionFields.scopeIndex = cxxScopeGetDefTag();
+		if (g_oCXXTag.extensionFields.scopeIndex != CORK_NIL)
+		{
+			if (uKind == CXXTagKindMEMBER || uKind == CXXTagKindENUMERATOR)
+				g_oCXXTag.extensionFields.nth =
+					(short) countEntriesInScope(g_oCXXTag.extensionFields.scopeIndex,
+												true,
+												countSameKindEntry, &uKind);
+		}
 	}
 
 	// FIXME: meaning of "is file scope" is quite debatable...
@@ -654,6 +670,8 @@ int cxxTagCommit(int *piCorkQueueIndexFQ)
 #endif
 
 	int iCorkQueueIndex = makeTagEntry(&g_oCXXTag);
+	if (iCorkQueueIndex != CORK_NIL)
+		registerEntry(iCorkQueueIndex);
 
 	// Handle --extra=+q
 	if(!isXtagEnabled(XTAG_QUALIFIED_TAGS))