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 ambiguous (a*b, c*d) tuple parse

Browse source
This commit is contained in:
Brian Fiete 2022-06-24 09:25:43 -07:00
parent 7063959762
commit 48635c1939
5 changed files with 93 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

35
IDEHelper/Compiler/BfExprEvaluator.cpp
View file

@ -19262,6 +19262,8 @@ void BfExprEvaluator::PopulateDeferrredTupleAssignData(BfTupleExpression* tupleE
DeferredTupleAssignData::Entry entry;
entry.mExprEvaluator = NULL;
entry.mInnerTuple = NULL;
entry.mVarType = NULL;
entry.mVarNameNode = NULL;
BfExpression* valueExpr = tupleExpr->mValues[valueIdx];
entry.mExpr = valueExpr;
@ -19295,6 +19297,23 @@ void BfExprEvaluator::PopulateDeferrredTupleAssignData(BfTupleExpression* tupleE
if (resultType == NULL)
resultType = mModule->GetPrimitiveType(BfTypeCode_Var);
}
entry.mVarType = resultType;
}
if (auto binOpExpr = BfNodeDynCast<BfBinaryOperatorExpression>(valueExpr))
{
if (binOpExpr->mOp == BfBinaryOp_Multiply)
{
SetAndRestoreValue<bool> prevIgnoreError(mModule->mIgnoreErrors, true);
auto resolvedType = mModule->ResolveTypeRef(binOpExpr->mLeft, NULL);
prevIgnoreError.Restore();
if (resolvedType != NULL)
{
resultType = mModule->CreatePointerType(resolvedType);
entry.mVarType = resultType;
entry.mVarNameNode = binOpExpr->mRight;
}
}
}
if (resultType == NULL)
@ -19383,11 +19402,19 @@ void BfExprEvaluator::AssignDeferrredTupleAssignData(BfAssignmentExpression* ass
}
}
if (auto varDecl = BfNodeDynCast<BfVariableDeclaration>(child.mExpr))
if (child.mVarType != NULL)
{
if (!elementValue)
elementValue = mModule->GetDefaultTypedValue(fieldInstance->GetResolvedType());
mModule->HandleVariableDeclaration(varDecl, elementValue);
if (auto varDecl = BfNodeDynCast<BfVariableDeclaration>(child.mExpr))
{
if (!elementValue)
elementValue = mModule->GetDefaultTypedValue(fieldInstance->GetResolvedType());
mModule->HandleVariableDeclaration(varDecl, elementValue);
}
else
{
// This handles the 'a*b' disambiguated variable decl case
mModule->HandleVariableDeclaration(child.mVarType, child.mVarNameNode, elementValue);
}
}
}
}