Extern/Beef
1
0
Fork 0
mirror of https://github.com/beefytech/Beef.git synced 2025-06-09 03:52:19 +02:00
Code Activity

Fixed errors during qualified static field reference

Browse source
This commit is contained in:
Brian Fiete 2021-01-22 08:50:21 -08:00
parent c0dd9b0e09
commit 71f677d902
7 changed files with 25 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

24
IDEHelper/Compiler/BfModuleTypeUtils.cpp
View file

@ -6613,7 +6613,7 @@ void BfModule::HandleMethodGenericParamRef(BfAstNode* refNode, BfTypeDef* typeDe
mCompiler->mResolvePassData->HandleMethodGenericParam(refNode, typeDef, methodDef, methodGenericParamIdx);
}
BfType* BfModule::ResolveInnerType(BfType* outerType, BfTypeReference* typeRef, BfPopulateType populateType, bool ignoreErrors, int numGenericArgs)
BfType* BfModule::ResolveInnerType(BfType* outerType, BfAstNode* typeRef, BfPopulateType populateType, bool ignoreErrors, int numGenericArgs)
{
BfTypeDef* nestedTypeDef = NULL;
@ -6623,6 +6623,7 @@ BfType* BfModule::ResolveInnerType(BfType* outerType, BfTypeReference* typeRef,
BfNamedTypeReference* namedTypeRef = NULL;
BfGenericInstanceTypeRef* genericTypeRef = NULL;
BfDirectStrTypeReference* directStrTypeRef = NULL;
BfIdentifierNode* identifierNode = NULL;
if ((namedTypeRef = BfNodeDynCast<BfNamedTypeReference>(typeRef)))
{
//TYPEDEF nestedTypeDef = namedTypeRef->mTypeDef;
@ -6632,12 +6633,16 @@ BfType* BfModule::ResolveInnerType(BfType* outerType, BfTypeReference* typeRef,
namedTypeRef = BfNodeDynCast<BfNamedTypeReference>(genericTypeRef->mElementType);
//TYPEDEF nestedTypeDef = namedTypeRef->mTypeDef;
}
else if ((identifierNode = BfNodeDynCast<BfIdentifierNode>(typeRef)))
{
//TYPEDEF nestedTypeDef = namedTypeRef->mTypeDef;
}
else if ((directStrTypeRef = BfNodeDynCast<BfDirectStrTypeReference>(typeRef)))
{
//
}
BF_ASSERT((namedTypeRef != NULL) || (directStrTypeRef != NULL));
BF_ASSERT((identifierNode != NULL) || (namedTypeRef != NULL) || (directStrTypeRef != NULL));
auto usedOuterType = outerType;
if (nestedTypeDef == NULL)
@ -6645,6 +6650,8 @@ BfType* BfModule::ResolveInnerType(BfType* outerType, BfTypeReference* typeRef,
StringView findName;
if (namedTypeRef != NULL)
findName = namedTypeRef->mNameNode->ToStringView();
else if (identifierNode != NULL)
findName = identifierNode->ToStringView();
else
findName = directStrTypeRef->mTypeName;
@ -6744,7 +6751,7 @@ BfType* BfModule::ResolveInnerType(BfType* outerType, BfTypeReference* typeRef,
genericArgs.clear();
}
else
{
{
ShowGenericArgCountError(typeRef, (int)nestedTypeDef->mGenericParamDefs.size() - (int)nestedTypeDef->mOuterType->mGenericParamDefs.size());
return NULL;
}
@ -8083,7 +8090,7 @@ void BfModule::ShowAmbiguousTypeError(BfAstNode* refNode, BfTypeDef* typeDef, Bf
}
}
void BfModule::ShowGenericArgCountError(BfTypeReference* typeRef, int wantedGenericParams)
void BfModule::ShowGenericArgCountError(BfAstNode* typeRef, int wantedGenericParams)
{
BfGenericInstanceTypeRef* genericTypeInstRef = BfNodeDynCast<BfGenericInstanceTypeRef>(typeRef);
@ -10363,15 +10370,6 @@ BfTypeInstance* BfModule::GetUnspecializedTypeInstance(BfTypeInstance* typeInst)
return result->ToTypeInstance();
}
BfType* BfModule::ResolveInnerType(BfType* outerType, BfIdentifierNode* identifier, BfPopulateType populateType, bool ignoreErrors)
{
BfDirectStrTypeReference typeRef;
typeRef.Init(identifier->ToString());
// There is no ref node so we ignore errors
auto type = ResolveInnerType(outerType, &typeRef, populateType, /*ignoreErrors*/true);
return type;
}
BfType* BfModule::ResolveTypeRef(BfAstNode* astNode, const BfSizedArray<BfTypeReference*>* genericArgs, BfPopulateType populateType, BfResolveTypeRefFlags resolveFlags)
{
if ((genericArgs == NULL) || (genericArgs->size() == 0))