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

Fixed some constraint lookups

Browse source
This commit is contained in:
Brian Fiete 2022-01-11 12:02:23 -05:00
parent 3fcaa6b397
commit ed6959973a
3 changed files with 60 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

22
IDEHelper/Compiler/BfExprEvaluator.cpp
View file

@ -4228,7 +4228,8 @@ BfTypedValue BfExprEvaluator::LookupField(BfAstNode* targetSrc, BfTypedValue tar
{
if ((target.mType != NULL && (target.mType->IsGenericParam())))
{
auto genericParamInst = mModule->GetGenericParamInstance((BfGenericParamType*)target.mType);
auto genericParamType = (BfGenericParamType*)target.mType;
auto genericParamInst = mModule->GetGenericParamInstance(genericParamType);
if (target.mValue)
{
@ -4242,10 +4243,20 @@ BfTypedValue BfExprEvaluator::LookupField(BfAstNode* targetSrc, BfTypedValue tar
}
}
if ((mModule->mCurMethodInstance != NULL) && (mModule->mCurMethodInstance->mIsUnspecialized))
bool isUnspecializedSection = false;
if (genericParamType->mGenericParamKind == BfGenericParamKind_Method)
isUnspecializedSection = (mModule->mCurMethodInstance != NULL) && (mModule->mCurMethodInstance->mIsUnspecialized);
else
isUnspecializedSection = (mModule->mCurTypeInstance != NULL) && (mModule->mCurTypeInstance->IsUnspecializedType());
if (isUnspecializedSection)
{
if (genericParamInst->mTypeConstraint != NULL)
{
target.mType = genericParamInst->mTypeConstraint;
if (target.mType->IsWrappableType())
target.mType = mModule->GetWrappedStructType(target.mType);
}
else
target.mType = mModule->mContext->mBfObjectType;
@ -19600,6 +19611,13 @@ void BfExprEvaluator::Visit(BfIndexerExpression* indexerExpr)
if (!target.HasType())
return;
if (target.mType->IsGenericParam())
{
auto genericParamInstance = mModule->GetGenericParamInstance((BfGenericParamType*)target.mType);
if (genericParamInstance->mTypeConstraint != NULL)
target.mType = genericParamInstance->mTypeConstraint;
}
BfCheckedKind checkedKind = BfCheckedKind_NotSet;
bool isInlined = false;

6
IDEHelper/Compiler/BfReducer.cpp
View file

@ -697,6 +697,12 @@ bool BfReducer::IsTypeReference(BfAstNode* checkNode, BfToken successToken, int*
}
else if (checkToken == BfToken_RBracket)
{
if (bracketDepth == 0)
{
// Not even an array
return false;
}
endBracket = checkIdx;
}
else if ((checkToken == BfToken_Star) || (checkToken == BfToken_Question))

34
IDEHelper/Tests/src/Constraints.bf
View file

@ -76,6 +76,40 @@ namespace Tests
ClassA<T>.DoAdd(val, val);
}
struct StringViewEnumerator<TS, C> : IEnumerator<StringView>
where C : const int
where TS : StringView[C]
{
private TS mStrings;
private int mIdx;
public this(TS strings)
{
mStrings = strings;
mIdx = -1;
}
public StringView Current
{
get
{
return mStrings[mIdx];
}
}
public bool MoveNext() mut
{
return ++mIdx != mStrings.Count;
}
public Result<StringView> GetNext() mut
{
if (!MoveNext())
return .Err;
return Current;
}
}
[Test]
public static void TestBasics()
{