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

Avoid putting things like ValueType into Fail types for ValueType.Equals

Browse source
This commit is contained in:
Brian Fiete 2024-02-13 08:34:34 -05:00
parent 36700b39ab
commit 337a94b8b5
1 changed files with 2 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
IDEHelper/Compiler/CeMachine.cpp
View file

@ -3578,6 +3578,7 @@ BfError* CeContext::Fail(const StringImpl& error)
return NULL; return NULL;
if (mCurEmitContext != NULL) if (mCurEmitContext != NULL)
mCurEmitContext->mFailed = true; mCurEmitContext->mFailed = true;
SetAndRestoreValue<BfTypeInstance*> prevTypeInst(mCurModule->mCurTypeInstance, mCallerTypeInstance);
auto bfError = mCurModule->Fail(StrFormat("Unable to comptime %s", mCurModule->MethodToString(mCurMethodInstance).c_str()), mCurCallSource->mRefNode, (mCurEvalFlags & CeEvalFlags_PersistantError) != 0); auto bfError = mCurModule->Fail(StrFormat("Unable to comptime %s", mCurModule->MethodToString(mCurMethodInstance).c_str()), mCurCallSource->mRefNode, (mCurEvalFlags & CeEvalFlags_PersistantError) != 0);
if (bfError == NULL) if (bfError == NULL)
return NULL; return NULL;
@ -3593,6 +3594,7 @@ BfError* CeContext::Fail(const CeFrame& curFrame, const StringImpl& str)
{ {
if (mCurEmitContext != NULL) if (mCurEmitContext != NULL)
mCurEmitContext->mFailed = true; mCurEmitContext->mFailed = true;
SetAndRestoreValue<BfTypeInstance*> prevTypeInst(mCurModule->mCurTypeInstance, mCallerTypeInstance);
auto bfError = mCurModule->Fail(StrFormat("Unable to comptime %s", mCurModule->MethodToString(mCurMethodInstance).c_str()), mCurCallSource->mRefNode, auto bfError = mCurModule->Fail(StrFormat("Unable to comptime %s", mCurModule->MethodToString(mCurMethodInstance).c_str()), mCurCallSource->mRefNode,
(mCurEvalFlags & CeEvalFlags_PersistantError) != 0, (mCurEvalFlags & CeEvalFlags_PersistantError) != 0,
((mCurEvalFlags & CeEvalFlags_DeferIfNotOnlyError) != 0) && !mCurModule->mHadBuildError); ((mCurEvalFlags & CeEvalFlags_DeferIfNotOnlyError) != 0) && !mCurModule->mHadBuildError);