C++: fill scope file of name kind tags

    using A::B::C;

For the input, this change makes a tag for C like:

TODO::
* the way to handle the first "::" in 'using ::std::cout;'
* the way to handle 'namespace X { using A::B; }'
  How can we represent the relationship between X and B.

Signed-off-by: Masatake YAMATO <yamato@redhat.com>

Author: masatake

Units/parser-cxx.r/using.cpp.d/expected.tags

@@ -1,9 +1,14 @@
 A	input.cpp	/^class A$/;"	class	file:	roles:def
 B	input.cpp	/^class B : public A$/;"	class	file:	roles:def
+C	input.cpp	/^	class C : A$/;"	class	namespace:X	file:	roles:def
+D	input.cpp	/^class D : X::C$/;"	class	file:	roles:def
+X	input.cpp	/^namespace X$/;"	namespace	file:	roles:def
 std	input.cpp	/^using namespace std;$/;"	namespace	file:	roles:used
 string	input.cpp	/^#include <string>/;"	header	roles:system
-string	input.cpp	/^using std::string;$/;"	name	file:	roles:used
-test	input.cpp	/^	using A::test;$/;"	name	class:B	roles:used
+string	input.cpp	/^using std::string;$/;"	name	name:std	roles:used
+test	input.cpp	/^	using A::test;$/;"	name	name:A	roles:used
 test	input.cpp	/^	void test();$/;"	prototype	class:A	typeref:typename:void	file:	signature:()	roles:def
 test	input.cpp	/^	void test(x t);$/;"	prototype	class:B	typeref:typename:void	file:	signature:(x t)	roles:def
+test2	input.cpp	/^		void test2();$/;"	prototype	class:X::C	typeref:typename:void	file:	signature:()	roles:def
+test2	input.cpp	/^	using X::C::test2;$/;"	name	name:X::C	roles:used
 x	input.cpp	/^using x = std::string;$/;"	typedef	typeref:typename:std::string	file:	roles:def

Units/parser-cxx.r/using.cpp.d/input.cpp

@@ -15,4 +15,19 @@ class B : public A
 public:
 	void test(x t);
 	using A::test;
-};
+};
+
+namespace X
+{
+	class C : A
+	{
+	public:
+		void test2();
+	};
+}
+
+class D : X::C
+{
+public:
+	using X::C::test2;
+};

parsers/cxx/cxx_debug.c

@@ -172,6 +172,7 @@ const char* cxxDebugScopeDecode(enum CXXScopeType scope)
 		[CXXScopeTypeVariable] = "variable",
 		[CXXScopeTypePrototype]  = "prototype",
 		[CXXScopeTypeTypedef] = "typedef",
+		[CXXScopeTypeName] = "name",
 	};
 	if (CXXScopeTypeLAST > scope)
 		return table[scope];

parsers/cxx/cxx_parser_using.c

@@ -118,6 +118,8 @@ bool cxxParserParseUsingClause(void)
 		if(g_cxx.pTokenChain->iCount > 0)
 		{
 			tagEntryInfo * tag;
+			int iScopeCount = 0;
+			CXXTokenChain *pOriginalScope = NULL;
 
 			if(bUsingNamespace)
 			{
@@ -145,10 +147,34 @@ bool cxxParserParseUsingClause(void)
 						"Found using clause '%s' which imports a name",
 						vStringValue(t->pszWord)
 					);
+
+				// Backup the original scope stack
+				int iSize = cxxScopeGetSize();
+				if(iSize > 0)
+				{
+					pOriginalScope = cxxTokenChainCreate();
+					while(iSize--)
+					{
+						CXXToken *t0 = cxxScopeTakeTop();
+						cxxTokenChainPrepend(pOriginalScope, t0);
+					}
+				}
+
+				// Push temporary scopes for the name
+				while(cxxTokenChainFirst(g_cxx.pTokenChain) != t)
+				{
+					CXXToken *pTokenScope = cxxTokenChainTakeFirst(g_cxx.pTokenChain);
+					if(cxxTokenTypeIs(pTokenScope,CXXTokenTypeIdentifier))
+					{
+						cxxScopePush(pTokenScope,CXXScopeTypeName,CXXScopeAccessUnknown);
+						iScopeCount++;
+					}
+					else
+						cxxTokenDestroy(pTokenScope);
+				}
+
 				tag = cxxRefTagBegin(CXXTagCPPKindNAME,
 									 CXXTagCPPNameRoleUSED, t);
-
-				// FIXME: We need something like "nameref:<condensed>" here!
 			}
 
 			if(tag)
@@ -157,6 +183,19 @@ bool cxxParserParseUsingClause(void)
 							(!isInputHeaderFile());
 				cxxTagCommit();
 			}
+
+			// Destory the temporary scopes for the name
+			while(iScopeCount--)
+				cxxScopePop();
+
+			// Recover the original scope stack
+			if(pOriginalScope)
+			{
+				CXXToken *t0;
+				while((t0 = cxxTokenChainTakeFirst(pOriginalScope)))
+					cxxScopePushTop(t0);
+				cxxTokenChainDestroy(pOriginalScope);
+			}
 		}
 	}
 

parsers/cxx/cxx_scope.c

@@ -112,6 +112,8 @@ unsigned int cxxScopeGetKind(void)
 			return CXXTagKindVARIABLE;
 		case CXXScopeTypeTypedef:
 			return CXXTagKindTYPEDEF;
+		case CXXScopeTypeName:
+			return CXXTagCPPKindNAME;
 		default:
 			CXX_DEBUG_ASSERT(false,"Unhandled scope type!");
 			break;

parsers/cxx/cxx_scope.h

@@ -32,6 +32,8 @@ enum CXXScopeType
 	CXXScopeTypeVariable, // template variables, mainly
 	CXXScopeTypePrototype,
 	CXXScopeTypeTypedef,  // template variables used in "using A = B<T>"
+	CXXScopeTypeName,	  /* for representing scope information of
+							 foo in "using some::thing::foo" */
 	CXXScopeTypeLAST
 };