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

Array size fix with missing commas

Browse source
This commit is contained in:
Brian Fiete 2020-10-10 05:40:07 -07:00
parent 5a805e96d8
commit 0f9ae6ab8c
1 changed files with 13 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

24
IDEHelper/Compiler/BfExprEvaluator.cpp
View file

@ -12099,13 +12099,14 @@ void BfExprEvaluator::Visit(BfObjectCreateExpression* objCreateExpr)
unresolvedTypeRef = mModule->mContext->mBfObjectType;
int dimensions = 1;
if (arrayTypeRef->mParams.size() != 0)
{
auto intType = mModule->ResolveTypeDef(mModule->mSystem->mTypeIntPtr);
for (auto arg : arrayTypeRef->mParams)
for (int argIdx = 0; argIdx < (int)arrayTypeRef->mParams.size(); argIdx++)
{
auto arg = arrayTypeRef->mParams[argIdx];
if (auto tokenNode = BfNodeDynCastExact<BfTokenNode>(arg))
{
if (tokenNode->GetToken() == BfToken_Comma)
@ -12113,18 +12114,11 @@ void BfExprEvaluator::Visit(BfObjectCreateExpression* objCreateExpr)
if (isRawArrayAlloc)
{
mModule->Fail("Sized arrays cannot be multidimensional.", tokenNode);
continue;
}
dimensions++;
if (dimensions == 5)
{
mModule->Fail("Too many array dimensions, consider using a jagged array.", tokenNode);
}
continue;
}
}
auto expr = BfNodeDynCast<BfExpression>(arg);
if ((isRawArrayAlloc) && (!dimLengthVals.IsEmpty()))
{
@ -12132,6 +12126,14 @@ void BfExprEvaluator::Visit(BfObjectCreateExpression* objCreateExpr)
continue;
}
if (argIdx != 0)
{
dimensions++;
if (dimensions == 5)
{
mModule->Fail("Too many array dimensions, consider using a jagged array.", arg);
}
}
dimLengthRefs.Add(expr);