...

vczh-libraries · Feb 17, 2020 · c83c46a · c83c46a
1 parent a2987f0
commit c83c46a
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 17 deletions.
diff --git a/Tools/CppDoc/Core/Source/Ast_Evaluate_ToTsys_IdImpl.cpp b/Tools/CppDoc/Core/Source/Ast_Evaluate_ToTsys_IdImpl.cpp
@@ -40,7 +40,7 @@ namespace symbol_totsys_impl
 			return;
 		case symbol_component::SymbolKind::GenericTypeArgument:
 			{
-				auto argumentKey = EvaluateGenericArgumentSymbol(symbol);
+				auto argumentKey = GetTemplateArgumentKey(symbol, pa.tsys.Obj());
 				ITsys* replacedType = nullptr;
 				if(pa.TryGetReplacedGenericArg(argumentKey, replacedType))
 				{

diff --git a/Tools/CppDoc/Core/Source/Ast_Resolving.h b/Tools/CppDoc/Core/Source/Ast_Resolving.h
@@ -121,6 +121,7 @@ namespace symbol_type_resolving
 
 	extern Ptr<TemplateSpec>					GetTemplateSpecFromSymbol(Symbol* symbol);
 	extern ITsys*								GetTemplateArgumentKey(const TemplateSpec::Argument& argument, ITsysAlloc* tsys);
+	extern ITsys*								GetTemplateArgumentKey(Symbol* argumentSymbol, ITsysAlloc* tsys);
 	extern void									CreateGenericFunctionHeader(const ParsingArguments& pa, Symbol* declSymbol, ITsys* parentDeclType, Ptr<TemplateSpec> spec, TypeTsysList& params, TsysGenericFunction& genericFunction);
 	extern void									ResolveGenericParameters(
 													const ParsingArguments& invokerPa,

diff --git a/Tools/CppDoc/Core/Source/Ast_Resolving_Generic.cpp b/Tools/CppDoc/Core/Source/Ast_Resolving_Generic.cpp
@@ -32,7 +32,7 @@ namespace symbol_type_resolving
 	}
 
 	/***********************************************************************
-	CreateGenericFunctionHeader: Calculate enough information to create a generic function type
+	GetTemplateArgumentKey: Get an ITsys* for TsysGenericFunction keys
 	***********************************************************************/
 
 	ITsys* GetTemplateArgumentKey(const TemplateSpec::Argument& argument, ITsysAlloc* tsys)
@@ -47,6 +47,23 @@ namespace symbol_type_resolving
 		}
 	}
 
+	ITsys* GetTemplateArgumentKey(Symbol* argumentSymbol, ITsysAlloc* tsys)
+	{
+		switch (argumentSymbol->kind)
+		{
+		case symbol_component::SymbolKind::GenericTypeArgument:
+			return EvaluateGenericArgumentSymbol(argumentSymbol);
+		case symbol_component::SymbolKind::GenericValueArgument:
+			return tsys->DeclOf(argumentSymbol);
+		default:
+			throw TypeCheckerException();
+		}
+	}
+
+	/***********************************************************************
+	CreateGenericFunctionHeader: Calculate enough information to create a generic function type
+	***********************************************************************/
+
 	void CreateGenericFunctionHeader(const ParsingArguments& pa, Symbol* declSymbol, ITsys* parentDeclType, Ptr<TemplateSpec> spec, TypeTsysList& params, TsysGenericFunction& genericFunction)
 	{
 		if (!declSymbol) throw TypeCheckerException();

diff --git a/Tools/CppDoc/Core/Source/Ast_Resolving_IFT.h b/Tools/CppDoc/Core/Source/Ast_Resolving_IFT.h
@@ -60,7 +60,7 @@ namespace symbol_type_resolving
 			if (auto idType = dynamic_cast<IdType*>(involvedTypes[j]))
 			{
 				auto patternSymbol = idType->resolving->resolvedSymbols[0];
-				auto pattern = EvaluateGenericArgumentSymbol(patternSymbol);
+				auto pattern = GetTemplateArgumentKey(patternSymbol, pa.tsys.Obj());
 				if (patternSymbol->ellipsis)
 				{
 					callback(patternSymbol, pattern);
@@ -73,7 +73,7 @@ namespace symbol_type_resolving
 			if (auto idExpr = dynamic_cast<IdExpr*>(involvedExprs[j]))
 			{
 				auto patternSymbol = idExpr->resolving->resolvedSymbols[0];
-				auto pattern = pa.tsys->DeclOf(patternSymbol);
+				auto pattern = GetTemplateArgumentKey(patternSymbol, pa.tsys.Obj());
 				if (patternSymbol->ellipsis)
 				{
 					callback(patternSymbol, pattern);

diff --git a/Tools/CppDoc/Core/Source/Ast_Resolving_IFT_CollectFreeTypes.cpp b/Tools/CppDoc/Core/Source/Ast_Resolving_IFT_CollectFreeTypes.cpp
@@ -136,25 +136,20 @@ namespace symbol_type_resolving
 		{
 			if (self->resolving && self->resolving->resolvedSymbols.Count() == 1)
 			{
-				auto symbol = self->resolving->resolvedSymbols[0];
-				if (freeTypeSymbols.Contains(symbol))
+				auto patternSymbol = self->resolving->resolvedSymbols[0];
+				if (freeTypeSymbols.Contains(patternSymbol))
 				{
 					involved = true;
 					involvedTypes.Add(self);
 				}
 				else if(includeParentDeclArguments)
 				{
-					switch (symbol->kind)
+					switch (patternSymbol->kind)
 					{
 					case symbol_component::SymbolKind::GenericTypeArgument:
 					case symbol_component::SymbolKind::GenericValueArgument:
 						{
-							// consistent with GetTemplateArgumentKey
-							auto pattern = symbol->kind ==
-								symbol_component::SymbolKind::GenericTypeArgument
-								? EvaluateGenericArgumentSymbol(symbol)
-								: pa.tsys->DeclOf(symbol)
-								;
+							auto pattern = GetTemplateArgumentKey(patternSymbol, pa.tsys.Obj());
 							ITsys* patternValue = nullptr;
 							if (pa.TryGetReplacedGenericArg(pattern, patternValue))
 							{

diff --git a/Tools/CppDoc/Core/Source/Ast_Resolving_IFT_InferTemplateArgument.cpp b/Tools/CppDoc/Core/Source/Ast_Resolving_IFT_InferTemplateArgument.cpp
@@ -69,11 +69,11 @@ namespace symbol_type_resolving
 		{
 			if (!involvedExprs.Contains(expr.Obj())) return;
 			auto idExpr = expr.Cast<IdExpr>();
-			auto symbol = idExpr->resolving->resolvedSymbols[0];
-			auto& outputContext = symbol->ellipsis ? variadicContext : taContext;
+			auto patternSymbol = idExpr->resolving->resolvedSymbols[0];
+			auto& outputContext = patternSymbol->ellipsis ? variadicContext : taContext;
 
 			// consistent with GetTemplateArgumentKey
-			auto pattern = pa.tsys->DeclOf(symbol);
+			auto pattern = GetTemplateArgumentKey(patternSymbol, pa.tsys.Obj());
 			SetInferredResult(outputContext, pattern, nullptr);
 		}
 
@@ -266,7 +266,7 @@ namespace symbol_type_resolving
 			auto& outputContext = patternSymbol->ellipsis ? variadicContext : taContext;
 
 			// consistent with GetTemplateArgumentKey
-			auto pattern = EvaluateGenericArgumentSymbol(patternSymbol);
+			auto pattern = GetTemplateArgumentKey(patternSymbol, pa.tsys.Obj());
 
 			switch (patternSymbol->kind)
 			{