From 925497f1e7ce49890bebe8200fa2544abef51004 Mon Sep 17 00:00:00 2001 From: Brian Fiete Date: Wed, 27 Jan 2021 15:16:21 -0800 Subject: [PATCH] Copy outer external constraints --- IDEHelper/Compiler/BfDefBuilder.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/IDEHelper/Compiler/BfDefBuilder.cpp b/IDEHelper/Compiler/BfDefBuilder.cpp index 8a9f5d61..828f271a 100644 --- a/IDEHelper/Compiler/BfDefBuilder.cpp +++ b/IDEHelper/Compiler/BfDefBuilder.cpp @@ -1702,10 +1702,13 @@ void BfDefBuilder::Visit(BfTypeDeclaration* typeDeclaration) mCurTypeDef->mIsAbstract = false; } } - + int outerGenericSize = 0; - if (mCurTypeDef->mOuterType != NULL) - outerGenericSize = (int)mCurTypeDef->mOuterType->mGenericParamDefs.size(); + if (actualOuterTypeDef != NULL) + { + //outerGenericSize = (int)mCurTypeDef->mOuterType->mGenericParamDefs.size(); + mCurTypeDef->mExternalConstraints = actualOuterTypeDef->GetLatest()->mExternalConstraints; + } bool isGeneric = (outerGenericSize != 0) || (typeDeclaration->mGenericParams != NULL); ParseGenericParams(typeDeclaration->mGenericParams, typeDeclaration->mGenericConstraintsDeclaration, mCurTypeDef->mGenericParamDefs, &mCurTypeDef->mExternalConstraints, outerGenericSize, isGeneric);