Extern/Beef
1
0
Fork 0
mirror of https://github.com/beefytech/Beef.git synced 2025-06-15 06:44:10 +02:00
Code Activity

Fixed generics property and ctor visibility

Browse source
This commit is contained in:
Brian Fiete 2020-05-16 08:21:20 -07:00
parent 372bb5f32f
commit 7434885d07
1 changed files with 14 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

9
IDEHelper/Compiler/BfExprEvaluator.cpp
View file

@ -5714,9 +5714,12 @@ BfTypedValue BfExprEvaluator::MatchConstructor(BfAstNode* targetSrc, BfMethodBou
if (checkMethod->mIsStatic) if (checkMethod->mIsStatic)
continue; continue;
if (!mModule->IsInSpecializedSection())
{
if ((!curTypeInst->IsTypeMemberIncluded(checkMethod->mDeclaringType, activeTypeDef, mModule)) || if ((!curTypeInst->IsTypeMemberIncluded(checkMethod->mDeclaringType, activeTypeDef, mModule)) ||
(!curTypeInst->IsTypeMemberAccessible(checkMethod->mDeclaringType, activeTypeDef))) (!curTypeInst->IsTypeMemberAccessible(checkMethod->mDeclaringType, activeTypeDef)))
continue; continue;
}
auto checkProt = checkMethod->mProtection; auto checkProt = checkMethod->mProtection;
@ -12400,7 +12403,8 @@ BfModuleMethodInstance BfExprEvaluator::GetSelectedMethod(BfAstNode* targetSrc,
paramSrc = methodMatcher.mArguments[methodMatcher.mBestMethodGenericArgumentSrcs[checkGenericIdx]].mExpression; paramSrc = methodMatcher.mArguments[methodMatcher.mBestMethodGenericArgumentSrcs[checkGenericIdx]].mExpression;
BfError* error = NULL; BfError* error = NULL;
if ((!failed) && (!mModule->CheckGenericConstraints(BfGenericParamSource(methodInstance.mMethodInstance), genericArg, paramSrc, genericParams[checkGenericIdx], &methodMatcher.mBestMethodGenericArguments, &error))) if (!mModule->CheckGenericConstraints(BfGenericParamSource(methodInstance.mMethodInstance), genericArg, paramSrc, genericParams[checkGenericIdx], &methodMatcher.mBestMethodGenericArguments,
failed ? NULL : &error))
{ {
if (methodInstance.mMethodInstance->IsSpecializedGenericMethod()) if (methodInstance.mMethodInstance->IsSpecializedGenericMethod())
{ {
@ -14056,9 +14060,12 @@ BfModuleMethodInstance BfExprEvaluator::GetPropertyMethodInstance(BfMethodDef* m
mModule->PopulateType(checkTypeInst, BfPopulateType_DataAndMethods); mModule->PopulateType(checkTypeInst, BfPopulateType_DataAndMethods);
for (auto& iface : checkTypeInst->mInterfaces) for (auto& iface : checkTypeInst->mInterfaces)
{
if (!mModule->IsInSpecializedSection())
{ {
if (!checkTypeInst->IsTypeMemberAccessible(iface.mDeclaringType, activeTypeDef)) if (!checkTypeInst->IsTypeMemberAccessible(iface.mDeclaringType, activeTypeDef))
continue; continue;
}
if (iface.mInterfaceType == mPropTarget.mType) if (iface.mInterfaceType == mPropTarget.mType)
{ {