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 issues with failed const type expressions

Browse source
This commit is contained in:
Brian Fiete 2020-09-27 23:25:42 -07:00
parent ee4ae8f9ed
commit ae06346357
2 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
IDEHelper/Compiler/BfModuleTypeUtils.cpp
View file

@ -9303,6 +9303,9 @@ BfType* BfModule::ResolveTypeRef(BfTypeReference* typeRef, BfPopulateType popula
} }
constExprType->mType = GetPrimitiveType(result.mTypeCode); constExprType->mType = GetPrimitiveType(result.mTypeCode);
BF_ASSERT(constExprType->mType != NULL);
if (constExprType->mType == NULL)
constExprType->mType = GetPrimitiveType(BfTypeCode_IntPtr);
constExprType->mValue = result; constExprType->mValue = result;
resolvedEntry->mValue = constExprType; resolvedEntry->mValue = constExprType;

5
IDEHelper/Compiler/BfResolvedTypeUtils.cpp
View file

@ -2519,10 +2519,9 @@ BfVariant BfResolvedTypeSet::EvaluateToVariant(LookupContext* ctx, BfExpression*
{ {
BfConstResolver constResolver(ctx->mModule); BfConstResolver constResolver(ctx->mModule);
BfVariant variant = { BfTypeCode_None }; BfVariant variant = { BfTypeCode_None };
constResolver.Evaluate(expr); auto result = constResolver.Resolve(expr);
if (constResolver.mResult) if (result)
{ {
auto result = constResolver.mResult;
if (result.mKind == BfTypedValueKind_GenericConstValue) if (result.mKind == BfTypedValueKind_GenericConstValue)
{ {
constGenericParam = result.mType; constGenericParam = result.mType;