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

Fixed IsVar check

Browse source
This commit is contained in:
Brian Fiete 2022-01-22 07:01:57 -05:00
parent f4aa6c26ff
commit 27a792e559
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
IDEHelper/Compiler/BfExprEvaluator.cpp
View file

@ -3616,11 +3616,11 @@ static bool IsCharType(BfTypeCode typeCode)
} }
} }
bool BfExprEvaluator::IsVar(BfType* type) bool BfExprEvaluator::IsVar(BfType* type, bool forceIgnoreWrites)
{ {
if (type->IsVar()) if (type->IsVar())
return true; return true;
if ((type->IsGenericParam()) && (!mModule->mBfIRBuilder->mIgnoreWrites)) if ((type->IsGenericParam()) && (!forceIgnoreWrites) && (!mModule->mBfIRBuilder->mIgnoreWrites))
{ {
BF_ASSERT(mModule->mIsComptimeModule); BF_ASSERT(mModule->mIsComptimeModule);
return true; return true;
@ -4429,7 +4429,7 @@ BfTypedValue BfExprEvaluator::LookupField(BfAstNode* targetSrc, BfTypedValue tar
} }
} }
if ((target.mType != NULL) && (IsVar(target.mType))) if ((target.mType != NULL) && (IsVar(target.mType, (flags & BfLookupFieldFlag_BindOnly) != 0)))
return BfTypedValue(mModule->GetDefaultValue(target.mType), target.mType, true); return BfTypedValue(mModule->GetDefaultValue(target.mType), target.mType, true);
BfTypeInstance* startCheckType = mModule->mCurTypeInstance; BfTypeInstance* startCheckType = mModule->mCurTypeInstance;

2
IDEHelper/Compiler/BfExprEvaluator.h
View file

@ -404,7 +404,7 @@ public:
BfExprEvaluator(BfModule* module); BfExprEvaluator(BfModule* module);
~BfExprEvaluator(); ~BfExprEvaluator();
bool IsVar(BfType* type); bool IsVar(BfType* type, bool forceIgnoreWrites = false);
void GetLiteral(BfAstNode* refNode, const BfVariant& variant); void GetLiteral(BfAstNode* refNode, const BfVariant& variant);
void FinishExpressionResult(); void FinishExpressionResult();
virtual bool CheckAllowValue(const BfTypedValue& typedValue, BfAstNode* refNode); virtual bool CheckAllowValue(const BfTypedValue& typedValue, BfAstNode* refNode);