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

Sized array .InitAll elemented initializer

Browse source
This commit is contained in:
Brian Fiete 2022-08-23 12:07:02 -07:00
parent 05e002d8f5
commit 77a99bdacc
3 changed files with 45 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

24
BeefLibs/corlib/src/SizedArray.bf
View file

@ -15,6 +15,8 @@ namespace System
} }
} }
public explicit static operator T[CSize] (Self val) public explicit static operator T[CSize] (Self val)
{ {
return val.mVal; return val.mVal;
@ -109,6 +111,28 @@ namespace System
return Current; return Current;
} }
} }
public static T[CSize] InitAll
{
[Error("Element type has no default constructor")]
get
{
return default;
}
}
} }
extension SizedArray<T, CSize> where T : struct, new
{
public static T[CSize] InitAll
{
get
{
T[CSize] val;
for (int i < CSize)
val[i] = T();
return val;
}
}
}
} }

25
IDEHelper/Compiler/BfExprEvaluator.cpp
View file

@ -5709,14 +5709,22 @@ BfTypedValue BfExprEvaluator::LookupField(BfAstNode* targetSrc, BfTypedValue tar
if (matchedProp != NULL) if (matchedProp != NULL)
{ {
if (mModule->PreFail()) if ((matchedProp->mDeclaringType->IsExtension()) && (!prop->mDeclaringType->IsExtension()))
{ {
auto error = mModule->Fail(StrFormat("Ambiguous reference to property '%s.%s'", mModule->TypeToString(curCheckType).c_str(), fieldName.c_str()), targetSrc); // Prefer non-extension
if (error != NULL) continue;
}
else
{
if (mModule->PreFail())
{ {
mModule->mCompiler->mPassInstance->MoreInfo(StrFormat("See property declaration in project '%s'", matchedProp->mDeclaringType->mProject->mName.c_str()), matchedProp->mFieldDeclaration); auto error = mModule->Fail(StrFormat("Ambiguous reference to property '%s.%s'", mModule->TypeToString(curCheckType).c_str(), fieldName.c_str()), targetSrc);
mModule->mCompiler->mPassInstance->MoreInfo(StrFormat("See property declaration in project '%s'", prop->mDeclaringType->mProject->mName.c_str()), prop->mFieldDeclaration); if (error != NULL)
break; {
mModule->mCompiler->mPassInstance->MoreInfo(StrFormat("See property declaration in project '%s'", matchedProp->mDeclaringType->mProject->mName.c_str()), matchedProp->mFieldDeclaration);
mModule->mCompiler->mPassInstance->MoreInfo(StrFormat("See property declaration in project '%s'", prop->mDeclaringType->mProject->mName.c_str()), prop->mFieldDeclaration);
break;
}
} }
} }
} }
@ -21406,6 +21414,11 @@ void BfExprEvaluator::DoMemberReference(BfMemberReferenceExpression* memberRefEx
return; return;
} }
if (mExpectingType->IsSizedArray())
{
expectingTypeInst = mModule->GetWrappedStructType(mExpectingType);
}
if (expectingTypeInst == NULL) if (expectingTypeInst == NULL)
{ {
if (mModule->PreFail()) if (mModule->PreFail())

3
IDEHelper/Compiler/BfModuleTypeUtils.cpp
View file

@ -941,7 +941,8 @@ void BfModule::CheckMemberNames(BfTypeInstance* typeInst)
MemberRef* prevMemberRef = NULL; MemberRef* prevMemberRef = NULL;
if (memberMap.TryGetValue(memberRef.mName, &prevMemberRef)) if (memberMap.TryGetValue(memberRef.mName, &prevMemberRef))
{ {
//auto& prevMemberRef = itr->second; if ((prevMemberRef->mDeclaringType->IsExtension()) && (!memberRef.mDeclaringType->IsExtension()))
continue;
MemberRef* firstMemberRef = &memberRef; MemberRef* firstMemberRef = &memberRef;
MemberRef* secondMemberRef = prevMemberRef; MemberRef* secondMemberRef = prevMemberRef;