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

Reworked ref enumerators to support non-pointer refs

Browse source
This commit is contained in:
Brian Fiete 2020-05-01 16:29:12 -07:00
parent 70d32885b1
commit d5073e810c
10 changed files with 82 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

2
IDEHelper/Compiler/BfExprEvaluator.cpp
View file

@ -12150,7 +12150,7 @@ BfModuleMethodInstance BfExprEvaluator::GetSelectedMethod(BfAstNode* targetSrc,
if ((invocationExpr != NULL) && (invocationExpr->mGenericArgs != NULL))
{
errorNode = invocationExpr->mGenericArgs->mGenericArgs[(int)methodDef->mGenericParams.size()];
if (errorNode == NULL)
if ((errorNode == NULL) && (!invocationExpr->mGenericArgs->mCommas.IsEmpty()))
errorNode = invocationExpr->mGenericArgs->mCommas[(int)methodDef->mGenericParams.size() - 1];
}
mModule->Fail(StrFormat("Too many generic arguments, expected %d fewer", genericArgCountDiff), errorNode);

14
IDEHelper/Compiler/BfModuleTypeUtils.cpp
View file

@ -906,9 +906,7 @@ bool BfModule::PopulateType(BfType* resolvedTypeRef, BfPopulateType populateType
if (typeAliasDecl->mAliasToType != NULL)
aliasToType = ResolveTypeRef(typeAliasDecl->mAliasToType, BfPopulateType_IdentityNoRemapAlias);
}
//typeAlias->mModule = mContext->mScratchModule;
typeAlias->mTypeIncomplete = false;
typeAlias->mDefineState = BfTypeDefineState_DefinedAndMethodsSlotted;
if (aliasToType != NULL)
{
AddDependency(aliasToType, typeAlias, BfDependencyMap::DependencyFlag_DerivedFrom);
@ -951,7 +949,7 @@ bool BfModule::PopulateType(BfType* resolvedTypeRef, BfPopulateType populateType
resolvedTypeRef->mRebuildFlags = BfTypeRebuildFlag_None;
typeAlias->mCustomAttributes = GetCustomAttributes(typeDef->mTypeDeclaration->mAttributes, BfAttributeTargets_Alias);
return true;
// Fall through so generic params are populated in DoPopulateType
}
if (resolvedTypeRef->IsSizedArray())
@ -1159,6 +1157,7 @@ bool BfModule::PopulateType(BfType* resolvedTypeRef, BfPopulateType populateType
case BfTypeCode_Struct:
case BfTypeCode_Interface:
case BfTypeCode_Enum:
case BfTypeCode_TypeAlias:
// Implemented below
break;
case BfTypeCode_Extension:
@ -1518,6 +1517,13 @@ bool BfModule::DoPopulateType(BfType* resolvedTypeRef, BfPopulateType populateTy
BuildGenericParams(resolvedTypeRef);
}
if (resolvedTypeRef->IsTypeAlias())
{
typeInstance->mTypeIncomplete = false;
resolvedTypeRef->mDefineState = BfTypeDefineState_DefinedAndMethodsSlotted;
return true;
}
if (_CheckTypeDone())
return true;

23
IDEHelper/Compiler/BfResolvedTypeUtils.cpp
View file

@ -3768,7 +3768,28 @@ String BfTypeUtils::TypeToString(BfTypeReference* typeRef)
}
if (auto directStrTypeName = BfNodeDynCast<BfDirectStrTypeReference>(typeRef))
return directStrTypeName->mTypeName;
BF_FATAL("Not implemented");
if (auto tupleTypeRef = BfNodeDynCast<BfTupleTypeRef>(typeRef))
{
String name = "(";
for (int i = 0; i < tupleTypeRef->mFieldTypes.size(); i++)
{
if (i > 0)
name += ", ";
name += TypeToString(tupleTypeRef->mFieldTypes[i]);
if ((i < tupleTypeRef->mFieldNames.size()) && (tupleTypeRef->mFieldNames[i] != NULL))
{
name += " ";
name += tupleTypeRef->mFieldNames[i]->ToString();
}
}
name += ")";
return name;
}
BF_DBG_FATAL("Not implemented");
return "???";
}

28
IDEHelper/Compiler/BfStmtEvaluator.cpp
View file

@ -3696,6 +3696,7 @@ void BfModule::Visit(BfDeleteStatement* deleteStmt)
if (checkType->IsPointer())
{
auto innerType = checkType->GetUnderlyingType();
PopulateType(innerType);
if (innerType->IsValuelessType())
mayBeSentinel = true;
}
@ -5383,7 +5384,7 @@ void BfModule::Visit(BfForStatement* forStmt)
}
void BfModule::DoForLess(BfForEachStatement* forEachStmt)
{
{
UpdateSrcPos(forEachStmt);
BfScopeData scopeData;
@ -5714,8 +5715,7 @@ void BfModule::Visit(BfForEachStatement* forEachStmt)
{
if (genericItrInterface != NULL)
{
Fail(StrFormat("Type '%s' implements multiple %s<T> interfaces", TypeToString(itr.mType).c_str(), isRefExpression ? "IRefEnumerator" : "IEnumerator"), forEachStmt->mCollectionExpression);
return;
Fail(StrFormat("Type '%s' implements multiple %s<T> interfaces", TypeToString(itr.mType).c_str(), isRefExpression ? "IRefEnumerator" : "IEnumerator"), forEachStmt->mCollectionExpression);
}
itrInterface = interface;
@ -5724,7 +5724,11 @@ void BfModule::Visit(BfForEachStatement* forEachStmt)
{
varType = genericItrInterface->mTypeGenericArguments[0];
if (isRefExpression)
varType = CreateRefType(varType);
{
if (varType->IsPointer())
varType = CreateRefType(varType->GetUnderlyingType());
}
}
}
}
@ -5737,7 +5741,10 @@ void BfModule::Visit(BfForEachStatement* forEachStmt)
{
varType = genericItrInterface->mTypeGenericArguments[0];
if (isRefExpression)
varType = CreateRefType(varType);
{
if (varType->IsPointer())
varType = CreateRefType(varType);
}
}
}
}
@ -5761,9 +5768,9 @@ void BfModule::Visit(BfForEachStatement* forEachStmt)
refItrInterface = itrInterface;
PopulateType(refItrInterface);
// Must IRefEnumeratorf<T> must include only IEnumerator<T>
BF_ASSERT(refItrInterface->mInterfaces.size() == 1);
if (refItrInterface->mInterfaces.size() == 1)
itrInterface = refItrInterface->mInterfaces[0].mInterfaceType;
// BF_ASSERT(refItrInterface->mInterfaces.size() == 1);
// if (refItrInterface->mInterfaces.size() == 1)
// itrInterface = refItrInterface->mInterfaces[0].mInterfaceType;
}
itr = MakeAddressable(itr);
itr = RemoveReadOnly(itr);
@ -6220,7 +6227,10 @@ void BfModule::Visit(BfForEachStatement* forEachStmt)
{
auto nextVal = BfTypedValue(mBfIRBuilder->CreateBitCast(nextResult.mValue, mBfIRBuilder->MapType(CreatePointerType(nextEmbeddedType))), nextEmbeddedType, true);
if (isRefExpression)
nextVal = BfTypedValue(nextVal.mValue, CreateRefType(nextVal.mType->GetUnderlyingType()), true);
{
if (nextVal.mType->IsPointer())
nextVal = BfTypedValue(nextVal.mValue, CreateRefType(nextVal.mType->GetUnderlyingType()), true);
}
nextVal = Cast(forEachStmt->mCollectionExpression, nextVal, varType, BfCastFlags_Explicit);
nextVal = LoadValue(nextVal);
if (nextVal)