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

Improved circular mixin check, isconst(expr), [ConstSkip]

Browse source
This commit is contained in:
Brian Fiete 2022-05-30 11:40:49 -07:00
parent cab9b3d9c7
commit 75333a0928
19 changed files with 241 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

20
IDEHelper/Compiler/BfModule.h
View file

@ -445,6 +445,7 @@ public:
bool mAllowVariableDeclarations;
bool mInInitBlock;
bool mSupressNextUnreachable;
bool mInConstIgnore;
BfMixinState* mMixinState;
BfBlock* mAstBlock;
BfAstNode* mCloseNode;
@ -484,6 +485,7 @@ public:
mAllowTargeting = true;
mAllowVariableDeclarations = true;
mInInitBlock = false;
mInConstIgnore = false;
mMixinDepth = 0;
mScopeDepth = 0;
mScopeLocalId = -1;
@ -794,7 +796,7 @@ public:
class BfMixinState
{
public:
public:
BfMixinState* mPrevMixinState;
BfAstNode* mSource;
BfScopeData* mCallerScope;
@ -802,15 +804,30 @@ public:
BfFilePosition mInjectFilePosition;
BfMethodInstance* mMixinMethodInstance;
BfAstNode* mResultExpr;
SizedArray<BfType*, 8> mArgTypes;
SizedArray<BfIRValue, 8> mArgConsts;
int mLocalsStartIdx;
bool mUsedInvocationScope;
bool mHasDeferredUsage;
bool mCheckedCircularRef;
bool mDoCircularVarResult;
BfTypedValue mTarget;
int mLastTargetAccessId;
public:
BfMixinState()
{
mPrevMixinState = NULL;
mSource = NULL;
mCallerScope = NULL;
mTarget = NULL;
mMixinMethodInstance = NULL;
mResultExpr = NULL;
mLocalsStartIdx = 0;
mUsedInvocationScope = false;
mHasDeferredUsage = false;
mCheckedCircularRef = false;
mDoCircularVarResult = false;
mLastTargetAccessId = -1;
}
@ -1126,6 +1143,7 @@ public:
newScopeData->mPrevScope = mCurScope;
newScopeData->mMixinDepth = mCurScope->mMixinDepth;
newScopeData->mScopeDepth = mCurScope->mScopeDepth + 1;
newScopeData->mInConstIgnore = mCurScope->mInConstIgnore;
mCurScope = newScopeData;
mTailScope = mCurScope;
}