Fixed comptime declaring type with types with extension

IDEHelper/Compiler/BfDefBuilder.cpp

@@ -59,6 +59,7 @@ BfDefBuilder::BfDefBuilder(BfSystem* bfSystem)
 	mPassInstance = NULL;
 	mSystem = bfSystem;
 	mCurTypeDef = NULL;
+	mCurDeclaringTypeDef = NULL;
 	mCurActualTypeDef = NULL;
 	mFullRefresh = false;
 	mIsComptime = false;
@@ -391,7 +392,7 @@ void BfDefBuilder::Visit(BfConstructorDeclaration* ctorDeclaration)
 }
 
 BfMethodDef* BfDefBuilder::CreateMethodDef(BfMethodDeclaration* methodDeclaration, BfMethodDef* outerMethodDef)
-{
+{	
 	BfMethodDef* methodDef;
 
 	if (auto operatorDecl = BfNodeDynCast<BfOperatorDeclaration>(methodDeclaration))
@@ -403,8 +404,9 @@ BfMethodDef* BfDefBuilder::CreateMethodDef(BfMethodDeclaration* methodDeclaratio
 	}
 	else
 		methodDef = new BfMethodDef();
-	
-	methodDef->mDeclaringType = mCurTypeDef;
+
+	BF_ASSERT(mCurDeclaringTypeDef != NULL);
+	methodDef->mDeclaringType = mCurDeclaringTypeDef;
 	methodDef->mMethodDeclaration = methodDeclaration;
 	methodDef->mExplicitInterface = methodDeclaration->mExplicitInterface;
 	methodDef->mReturnTypeRef = methodDeclaration->mReturnType;	
@@ -703,7 +705,8 @@ BfMethodDef* BfDefBuilder::CreateMethodDef(BfMethodDeclaration* methodDeclaratio
 			fieldDef->mName = paramDef->mName;
 			fieldDef->mTypeRef = paramDef->mTypeRef;
 			fieldDef->mProtection = BfProtection_Public;
-			fieldDef->mDeclaringType = mCurTypeDef;
+			BF_ASSERT(mCurDeclaringTypeDef != NULL);
+			fieldDef->mDeclaringType = mCurDeclaringTypeDef;			
 			fieldDef->mIdx = mCurTypeDef->mFields.mSize;
 			if ((paramDef->mParamDeclaration->mModToken != NULL) &&
 				(paramDef->mParamDeclaration->mModToken->mToken == BfToken_ReadOnly))
@@ -923,7 +926,8 @@ void BfDefBuilder::Visit(BfPropertyDeclaration* propertyDeclaration)
 	propertyDef->mTypeRef = propertyDeclaration->mTypeRef;
 	propertyDef->mInitializer = NULL;
 	propertyDef->mFieldDeclaration = propertyDeclaration;
-	propertyDef->mDeclaringType = mCurTypeDef;
+	BF_ASSERT(mCurDeclaringTypeDef != NULL);
+	propertyDef->mDeclaringType = mCurDeclaringTypeDef;	
 
 	if (auto varType = BfNodeDynCast<BfLetTypeReference>(propertyDef->mTypeRef))		
 		propertyDef->mIsReadOnly = true;
@@ -948,7 +952,8 @@ void BfDefBuilder::Visit(BfPropertyDeclaration* propertyDeclaration)
 	if (needsAutoProperty)
 	{
 		BfFieldDef* fieldDef = new BfFieldDef();
-		fieldDef->mDeclaringType = mCurTypeDef;
+		BF_ASSERT(mCurDeclaringTypeDef != NULL);
+		fieldDef->mDeclaringType = mCurDeclaringTypeDef;
 		fieldDef->mFieldDeclaration = propertyDeclaration;
 		fieldDef->mProtection = BfProtection_Hidden;
 		fieldDef->mIsStatic = propertyDef->mIsStatic;
@@ -989,7 +994,8 @@ void BfDefBuilder::Visit(BfPropertyDeclaration* propertyDeclaration)
 
 		auto methodDef = new BfMethodDef();
 		mCurTypeDef->mMethods.push_back(methodDef);
-		methodDef->mDeclaringType = mCurTypeDef;
+		BF_ASSERT(mCurDeclaringTypeDef != NULL);
+		methodDef->mDeclaringType = mCurDeclaringTypeDef;
 		methodDef->mMethodDeclaration = methodDeclaration;
 		methodDef->mProtection = propertyDef->mProtection;
 		methodDef->mWantsBody = (methodDeclaration->mBody != NULL) && (WantsNode(methodDeclaration->mBody));
@@ -1108,7 +1114,8 @@ void BfDefBuilder::Visit(BfFieldDeclaration* fieldDeclaration)
 	auto fieldDef = new BfFieldDef();
 	mCurTypeDef->mFields.push_back(fieldDef);	
 	fieldDef->mFieldDeclaration = fieldDeclaration;
-	fieldDef->mDeclaringType = mCurTypeDef;
+	BF_ASSERT(mCurDeclaringTypeDef != NULL);
+	fieldDef->mDeclaringType = mCurDeclaringTypeDef;
 	if (fieldDeclaration->mNameNode != NULL)
 		fieldDef->mName = fieldDeclaration->mNameNode->ToString();
 	fieldDef->mProtection = GetProtection(fieldDeclaration->mProtectionSpecifier);	
@@ -1160,7 +1167,7 @@ void BfDefBuilder::Visit(BfEnumCaseDeclaration* enumCaseDeclaration)
 
 BfFieldDef* BfDefBuilder::AddField(BfTypeDef* typeDef, BfTypeReference* fieldType, const StringImpl& fieldName)
 {
-	BfFieldDef* fieldDef = new BfFieldDef();	
+	BfFieldDef* fieldDef = new BfFieldDef();
 	fieldDef->mDeclaringType = typeDef;
 	fieldDef->mTypeRef = fieldType;
 	fieldDef->mName = fieldName;
@@ -1409,6 +1416,7 @@ void BfDefBuilder::Visit(BfTypeDeclaration* typeDeclaration)
 		actualOuterTypeDef = actualOuterTypeDef->mOuterType;
 
 	SetAndRestoreValue<BfTypeDef*> prevTypeDef(mCurTypeDef, new BfTypeDef());
+	SetAndRestoreValue<BfTypeDef*> prevDeclaringTypeDef(mCurDeclaringTypeDef, mCurTypeDef);
 	SetAndRestoreValue<BfTypeDef*> prevActualTypeDef(mCurActualTypeDef, mCurTypeDef);
 
 	mCurTypeDef->mSystem = mSystem;
@@ -1967,7 +1975,8 @@ void BfDefBuilder::FinishTypeDef(bool wantsToString)
 
 					auto methodDef = new BfMethodDef();
 					mCurTypeDef->mMethods.Insert(methodIdx + 1, methodDef);
-					methodDef->mDeclaringType = mCurTypeDef;
+					BF_ASSERT(mCurDeclaringTypeDef != NULL);
+					methodDef->mDeclaringType = mCurDeclaringTypeDef;					
 					methodDef->mName = BF_METHODNAME_CALCAPPEND;
 					methodDef->mProtection = BfProtection_Public;					
 					methodDef->mMethodType = BfMethodType_CtorCalcAppend;
@@ -2240,7 +2249,8 @@ void BfDefBuilder::FinishTypeDef(bool wantsToString)
 	{		
 		auto methodDef = new BfMethodDef();
 		mCurTypeDef->mMethods.push_back(methodDef);
-		methodDef->mDeclaringType = mCurTypeDef;
+		BF_ASSERT(mCurDeclaringTypeDef != NULL);
+		methodDef->mDeclaringType = mCurDeclaringTypeDef;
 		methodDef->mName = BF_METHODNAME_ENUM_HASFLAG;
 		methodDef->mReturnTypeRef = mSystem->mDirectBoolTypeRef;
 		methodDef->mProtection = BfProtection_Public;
@@ -2251,7 +2261,8 @@ void BfDefBuilder::FinishTypeDef(bool wantsToString)
 		{
 			auto methodDef = new BfMethodDef();
 			mCurTypeDef->mMethods.push_back(methodDef);
-			methodDef->mDeclaringType = mCurTypeDef;			
+			BF_ASSERT(mCurDeclaringTypeDef != NULL);
+			methodDef->mDeclaringType = mCurDeclaringTypeDef;
 			methodDef->mName = BF_METHODNAME_ENUM_GETUNDERLYING;
 			methodDef->mReturnTypeRef = mSystem->mDirectSelfBaseTypeRef;
 			methodDef->mMethodType = BfMethodType_PropertyGetter;
@@ -2261,7 +2272,8 @@ void BfDefBuilder::FinishTypeDef(bool wantsToString)
 			auto propDef = new BfPropertyDef();
 			mCurTypeDef->mProperties.Add(propDef);
 			propDef->mTypeRef = mSystem->mDirectSelfBaseTypeRef;
-			propDef->mDeclaringType = mCurTypeDef;
+			BF_ASSERT(mCurDeclaringTypeDef != NULL);
+			methodDef->mDeclaringType = mCurDeclaringTypeDef;
 			propDef->mName = "Underlying";
 			propDef->mMethods.Add(methodDef);
 			propDef->mProtection = BfProtection_Public;
@@ -2271,7 +2283,8 @@ void BfDefBuilder::FinishTypeDef(bool wantsToString)
 		{
 			auto methodDef = new BfMethodDef();
 			mCurTypeDef->mMethods.push_back(methodDef);
-			methodDef->mDeclaringType = mCurTypeDef;
+			BF_ASSERT(mCurDeclaringTypeDef != NULL);
+			methodDef->mDeclaringType = mCurDeclaringTypeDef;
 			methodDef->mIsMutating = true;
 			methodDef->mName = BF_METHODNAME_ENUM_GETUNDERLYINGREF;
 			methodDef->mReturnTypeRef = mSystem->mDirectRefSelfBaseTypeRef;
@@ -2282,7 +2295,8 @@ void BfDefBuilder::FinishTypeDef(bool wantsToString)
 			auto propDef = new BfPropertyDef();
 			mCurTypeDef->mProperties.Add(propDef);
 			propDef->mTypeRef = mSystem->mDirectRefSelfBaseTypeRef;
-			propDef->mDeclaringType = mCurTypeDef;
+			BF_ASSERT(mCurDeclaringTypeDef != NULL);
+			propDef->mDeclaringType = mCurDeclaringTypeDef;
 			propDef->mName = "UnderlyingRef";
 			propDef->mMethods.Add(methodDef);
 			propDef->mProtection = BfProtection_Public;
@@ -2293,7 +2307,8 @@ void BfDefBuilder::FinishTypeDef(bool wantsToString)
 	{
 		auto methodDef = new BfMethodDef();
 		mCurTypeDef->mMethods.push_back(methodDef);
-		methodDef->mDeclaringType = mCurTypeDef;
+		BF_ASSERT(mCurDeclaringTypeDef != NULL);
+		methodDef->mDeclaringType = mCurDeclaringTypeDef;
 		methodDef->mName = BF_METHODNAME_TO_STRING;
 		methodDef->mReturnTypeRef = mSystem->mDirectVoidTypeRef;
 		methodDef->mProtection = BfProtection_Public;
@@ -2308,7 +2323,8 @@ void BfDefBuilder::FinishTypeDef(bool wantsToString)
 	{		
 		auto methodDef = new BfMethodDef();
 		mCurTypeDef->mMethods.push_back(methodDef);
-		methodDef->mDeclaringType = mCurTypeDef;
+		BF_ASSERT(mCurDeclaringTypeDef != NULL);
+		methodDef->mDeclaringType = mCurDeclaringTypeDef;
 		methodDef->mName = BF_METHODNAME_DEFAULT_EQUALS;
 		methodDef->mReturnTypeRef = mSystem->mDirectBoolTypeRef;
 		methodDef->mProtection = BfProtection_Private;
@@ -2322,7 +2338,8 @@ void BfDefBuilder::FinishTypeDef(bool wantsToString)
 	{
 		auto methodDef = new BfMethodDef();
 		mCurTypeDef->mMethods.push_back(methodDef);
-		methodDef->mDeclaringType = mCurTypeDef;
+		BF_ASSERT(mCurDeclaringTypeDef != NULL);
+		methodDef->mDeclaringType = mCurDeclaringTypeDef;
 		methodDef->mName = BF_METHODNAME_DEFAULT_STRICT_EQUALS;
 		methodDef->mReturnTypeRef = mSystem->mDirectBoolTypeRef;
 		methodDef->mProtection = BfProtection_Private;

IDEHelper/Compiler/BfDefBuilder.h

@@ -16,6 +16,7 @@ public:
 	BfSystem* mSystem;
 	BfPassInstance* mPassInstance;
 	BfTypeDef* mCurTypeDef;
+	BfTypeDef* mCurDeclaringTypeDef;
 	BfTypeDef* mCurActualTypeDef;
 	bool mFullRefresh;
 	bool mIsComptime;

IDEHelper/Compiler/BfModule.cpp

@@ -16566,7 +16566,7 @@ void BfModule::EmitInitBlocks(const std::function<void(BfAstNode*)>& initBlockCa
 
 	for (; initMethodDef != NULL; initMethodDef = initMethodDef->mNextWithSameName)
 	{
-		if (initMethodDef->mDeclaringType != methodDef->mDeclaringType)
+		if (initMethodDef->mDeclaringType->GetDefinition() != methodDef->mDeclaringType->GetDefinition())
 			continue;
 		if (initMethodDef->mMethodType != BfMethodType_Init)
 			continue;
@@ -20617,7 +20617,7 @@ BfMethodDef* BfModule::GetLocalMethodDef(BfLocalMethod* localMethod)
 		defBuilder.mCurSource = localMethod->mMethodDeclaration->GetParser();
 		defBuilder.mPassInstance = mCompiler->mPassInstance;
 		defBuilder.mCurTypeDef = mCurMethodInstance->mMethodDef->mDeclaringType;
-		
+		defBuilder.mCurDeclaringTypeDef = defBuilder.mCurTypeDef;
 		methodDef = defBuilder.CreateMethodDef(methodDeclaration, outerMethodDef);
 	}
 	else

IDEHelper/Compiler/BfModuleTypeUtils.cpp

@@ -2068,6 +2068,13 @@ void BfModule::UpdateCEEmit(CeEmitContext* ceEmitContext, BfTypeInstance* typeIn
 	BfDefBuilder defBuilder(mSystem);
 	defBuilder.mCurSource = emitParser;
 	defBuilder.mCurTypeDef = typeInstance->mTypeDef;
+	defBuilder.mCurDeclaringTypeDef = typeInstance->mTypeDef;
+
+	if (typeInstance->mTypeDef->mIsCombinedPartial)
+	{
+		// Always define generated methods on the primary type declaration
+		defBuilder.mCurDeclaringTypeDef = typeInstance->mTypeDef->mPartials[0]->GetLatest();
+	}
 	defBuilder.mPassInstance = mCompiler->mPassInstance;
 	defBuilder.mIsComptime = true;
 	defBuilder.DoVisitChild(typeDeclaration->mDefineNode);

IDEHelper/Compiler/BfResolvedTypeUtils.cpp

@@ -2621,6 +2621,7 @@ void BfTupleType::Finish()
 
 	BfDefBuilder bfDefBuilder(bfSystem);
 	bfDefBuilder.mCurTypeDef = mTypeDef;
+	bfDefBuilder.mCurDeclaringTypeDef = mTypeDef;
 	bfDefBuilder.FinishTypeDef(true);
 }
 

IDEHelper/Compiler/BfSystem.cpp

@@ -3220,7 +3220,10 @@ void BfSystem::CopyTypeDef(BfTypeDef* typeDef, BfTypeDef* fromTypeDef)
 		{
 			methodDef = new BfMethodDef();
 			*methodDef = *fromMethodDef;
-		}					
+		}
+
+		if (methodDef->mDeclaringType == fromTypeDef)
+			methodDef->mDeclaringType = typeDef;
 
 		for (int paramIdx = 0; paramIdx < fromMethodDef->mParams.mSize; paramIdx++)
 		{
@@ -3254,6 +3257,8 @@ void BfSystem::CopyTypeDef(BfTypeDef* typeDef, BfTypeDef* fromTypeDef)
 	{		
 		BfPropertyDef* propDef = new BfPropertyDef();		
 		*propDef = *fromPropDef;
+		if (propDef->mDeclaringType == fromTypeDef)
+			propDef->mDeclaringType = typeDef;
 		for (auto& methodDef : propDef->mMethods)		
 			methodDef = typeDef->mMethods[methodDef->mIdx];		
 		propDef->mNextWithSameName = NULL;
@@ -3264,6 +3269,8 @@ void BfSystem::CopyTypeDef(BfTypeDef* typeDef, BfTypeDef* fromTypeDef)
 	{
 		BfFieldDef* fieldDef = new BfFieldDef();
 		*fieldDef = *fromField;
+		if (fieldDef->mDeclaringType == fromTypeDef)
+			fieldDef->mDeclaringType = typeDef;
 		fieldDef->mNextWithSameName = NULL;
 		typeDef->mFields.Add(fieldDef);
 	}