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

Fixed some invalid error squiggles with undef-sized arrays

Browse source
This commit is contained in:
Brian Fiete 2021-10-30 07:36:14 -07:00
parent e0103b7dd7
commit 319f071eae
3 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
IDEHelper/Compiler/BfModule.cpp
View file

@ -16755,7 +16755,7 @@ void BfModule::EmitCtorBody(bool& skipBody)
mCompiler->mResolvePassData->mSourceClassifier->SetElementType(fieldDef->mInitializer, BfSourceElementType_Normal); mCompiler->mResolvePassData->mSourceClassifier->SetElementType(fieldDef->mInitializer, BfSourceElementType_Normal);
mCompiler->mResolvePassData->mSourceClassifier->VisitChild(fieldDef->mInitializer); mCompiler->mResolvePassData->mSourceClassifier->VisitChild(fieldDef->mInitializer);
auto wantType = ResolveTypeRef(fieldDef->mTypeRef); auto wantType = ResolveTypeRef(fieldDef->mTypeRef, BfPopulateType_Declaration, BfResolveTypeRefFlag_AllowInferredSizedArray);
if ((wantType != NULL) && if ((wantType != NULL) &&
((wantType->IsVar()) || (wantType->IsLet()) || (wantType->IsRef()))) ((wantType->IsVar()) || (wantType->IsLet()) || (wantType->IsRef())))
wantType = NULL; wantType = NULL;

5
IDEHelper/Compiler/BfModuleTypeUtils.cpp
View file

@ -3730,7 +3730,10 @@ void BfModule::DoPopulateType(BfType* resolvedTypeRef, BfPopulateType populateTy
} }
else else
{ {
resolvedFieldType = ResolveTypeRef(field->mTypeRef, BfPopulateType_Declaration, (BfResolveTypeRefFlags)(BfResolveTypeRefFlag_NoResolveGenericParam | BfResolveTypeRefFlag_AllowInferredSizedArray)); BfResolveTypeRefFlags resolveFlags = BfResolveTypeRefFlag_NoResolveGenericParam;
if (field->mInitializer != NULL)
resolveFlags = (BfResolveTypeRefFlags)(resolveFlags | BfResolveTypeRefFlag_AllowInferredSizedArray);
resolvedFieldType = ResolveTypeRef(field->mTypeRef, BfPopulateType_Declaration, resolveFlags);
if (resolvedFieldType == NULL) if (resolvedFieldType == NULL)
{ {
// Failed, just put in placeholder 'var' // Failed, just put in placeholder 'var'

2
IDEHelper/Compiler/BfResolvedTypeUtils.cpp
View file

@ -3278,7 +3278,7 @@ int BfResolvedTypeSet::DoHash(BfTypeReference* typeRef, LookupContext* ctx, BfHa
else if (constant->mConstType == BfConstType_Undef) else if (constant->mConstType == BfConstType_Undef)
{ {
elementCount = -1; // Marker for undef elementCount = -1; // Marker for undef
if ((ctx->mResolveFlags & BfResolveTypeRefFlag_AllowInferredSizedArray) == 0) if ((arrayType->IsInferredSize()) && ((ctx->mResolveFlags & BfResolveTypeRefFlag_AllowInferredSizedArray) == 0))
{ {
ctx->mModule->Fail("Invalid use of inferred-sized array", sizeExpr); ctx->mModule->Fail("Invalid use of inferred-sized array", sizeExpr);
} }