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

Improved indexer errors and indexer attributes

Browse source
This commit is contained in:
Brian Fiete 2022-06-06 08:50:30 -07:00
parent 39f7c01da3
commit 91a4af93af
1 changed files with 3 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
IDEHelper/Compiler/BfExprEvaluator.cpp
View file

@ -20940,6 +20940,9 @@ void BfExprEvaluator::Visit(BfIndexerExpression* indexerExpr)
mModule->mAttributeState->mUsed = true; mModule->mAttributeState->mUsed = true;
} }
} }
// Avoid attempting to apply the current attributes to the indexer arguments
SetAndRestoreValue<BfAttributeState*> prevAttributeState(mModule->mAttributeState, NULL);
bool isNullCondLookup = (indexerExpr->mOpenBracket != NULL) && (indexerExpr->mOpenBracket->GetToken() == BfToken_QuestionLBracket); bool isNullCondLookup = (indexerExpr->mOpenBracket != NULL) && (indexerExpr->mOpenBracket->GetToken() == BfToken_QuestionLBracket);
if (isNullCondLookup) if (isNullCondLookup)
@ -20959,16 +20962,11 @@ void BfExprEvaluator::Visit(BfIndexerExpression* indexerExpr)
BfSizedArray<BfExpression*> sizedArgExprs(indexerExpr->mArguments); BfSizedArray<BfExpression*> sizedArgExprs(indexerExpr->mArguments);
BfResolvedArgs argValues(&sizedArgExprs); BfResolvedArgs argValues(&sizedArgExprs);
ResolveArgValues(argValues, (BfResolveArgsFlags)(BfResolveArgsFlag_DeferParamEval | BfResolveArgsFlag_FromIndexer)); ResolveArgValues(argValues, (BfResolveArgsFlags)(BfResolveArgsFlag_DeferParamEval | BfResolveArgsFlag_FromIndexer));
//exprEvaluator.MatchMethod(elementExpr, NULL, initValue, false, false, "Add", argValues, NULL);
mIndexerValues = argValues.mResolvedArgs; mIndexerValues = argValues.mResolvedArgs;
for (auto& val : mIndexerValues)
if (!val.mTypedValue)
val.mTypedValue = mModule->GetDefaultTypedValue(mModule->mContext->mBfObjectType);
BfMethodMatcher methodMatcher(indexerExpr->mTarget, mModule, "[]", mIndexerValues, BfMethodGenericArguments()); BfMethodMatcher methodMatcher(indexerExpr->mTarget, mModule, "[]", mIndexerValues, BfMethodGenericArguments());
methodMatcher.mCheckedKind = checkedKind; methodMatcher.mCheckedKind = checkedKind;
//methodMatcher.CheckType(target.mType->ToTypeInstance(), target, false);
BfMethodDef* methodDef = NULL; BfMethodDef* methodDef = NULL;