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

Made missing commutable attribute a warning instead of an error

Browse source
This commit is contained in:
Brian Fiete 2020-12-05 04:44:43 -08:00
parent b5064536e0
commit 45ca40f2c7
2 changed files with 20 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

37
IDEHelper/Compiler/BfExprEvaluator.cpp
View file

@ -6087,7 +6087,7 @@ SplatArgs(lookupVal, irArgs);
} }
checkIdx--; checkIdx--;
} }
mModule->Warn(BfWarning_BF4204_StringInterpolationParam, "Expanded string interpolation argument not used as 'params'. If string allocation was intended then consider adding a specifier such as 'scope'.", errorRef); mModule->Warn(BfWarning_BF4205_StringInterpolationParam, "Expanded string interpolation argument not used as 'params'. If string allocation was intended then consider adding a specifier such as 'scope'.", errorRef);
} }
if ((arg == NULL) && (argValues[argExprIdx].mExpression != NULL)) if ((arg == NULL) && (argValues[argExprIdx].mExpression != NULL))
@ -19761,8 +19761,7 @@ void BfExprEvaluator::PerformBinaryOperation(BfAstNode* leftExpression, BfAstNod
for (int pass = 0; pass < 2; pass++) for (int pass = 0; pass < 2; pass++)
{ {
BfBinaryOp oppositeBinaryOp = BfGetOppositeBinaryOp(findBinaryOp); BfBinaryOp oppositeBinaryOp = BfGetOppositeBinaryOp(findBinaryOp);
bool foundOp = false; bool foundOp = false;
bool foundCommutableOps = false;
SizedArray<BfResolvedArg, 2> args; SizedArray<BfResolvedArg, 2> args;
BfResolvedArg leftArg; BfResolvedArg leftArg;
@ -19789,6 +19788,8 @@ void BfExprEvaluator::PerformBinaryOperation(BfAstNode* leftExpression, BfAstNod
bool invertResult = false; bool invertResult = false;
BfType* operatorConstraintReturnType = NULL; BfType* operatorConstraintReturnType = NULL;
bool wasTransformedUsage = pass == 1;
while (true) while (true)
{ {
auto entry = baseClassWalker.Next(); auto entry = baseClassWalker.Next();
@ -19801,16 +19802,6 @@ void BfExprEvaluator::PerformBinaryOperation(BfAstNode* leftExpression, BfAstNod
for (auto operatorDef : checkType->mTypeDef->mOperators) for (auto operatorDef : checkType->mTypeDef->mOperators)
{ {
if (operatorDef->mCommutableKind == BfCommutableKind_Operator)
{
foundCommutableOps = true;
}
else
{
if (pass == 1)
continue;
}
bool allowOp = operatorDef->mOperatorDeclaration->mBinOp == findBinaryOp; bool allowOp = operatorDef->mOperatorDeclaration->mBinOp == findBinaryOp;
if ((isComparison) && (operatorDef->mOperatorDeclaration->mBinOp == BfBinaryOp_Compare)) if ((isComparison) && (operatorDef->mOperatorDeclaration->mBinOp == BfBinaryOp_Compare))
allowOp = true; allowOp = true;
@ -19844,7 +19835,7 @@ void BfExprEvaluator::PerformBinaryOperation(BfAstNode* leftExpression, BfAstNod
} }
} }
} }
else if ((operatorDef->mOperatorDeclaration->mBinOp == oppositeBinaryOp) && (operatorDef->mCommutableKind == BfCommutableKind_Operator)) else if (operatorDef->mOperatorDeclaration->mBinOp == oppositeBinaryOp)
oppositeOperatorDefs.Add(operatorDef); oppositeOperatorDefs.Add(operatorDef);
} }
@ -19861,12 +19852,16 @@ void BfExprEvaluator::PerformBinaryOperation(BfAstNode* leftExpression, BfAstNod
operatorConstraintReturnType = returnType; operatorConstraintReturnType = returnType;
methodMatcher.mBestMethodDef = oppositeOperatorDef; methodMatcher.mBestMethodDef = oppositeOperatorDef;
methodMatcher.mSelfType = entry.mSrcType; methodMatcher.mSelfType = entry.mSrcType;
wasTransformedUsage = true;
} }
} }
else else
{ {
if (methodMatcher.CheckMethod(NULL, checkType, oppositeOperatorDef, false)) if (methodMatcher.CheckMethod(NULL, checkType, oppositeOperatorDef, false))
{
methodMatcher.mSelfType = entry.mSrcType; methodMatcher.mSelfType = entry.mSrcType;
wasTransformedUsage = true;
}
} }
} }
} }
@ -19897,7 +19892,7 @@ void BfExprEvaluator::PerformBinaryOperation(BfAstNode* leftExpression, BfAstNod
auto matchedOp = ((BfOperatorDeclaration*)methodMatcher.mBestMethodDef->mMethodDeclaration)->mBinOp; auto matchedOp = ((BfOperatorDeclaration*)methodMatcher.mBestMethodDef->mMethodDeclaration)->mBinOp;
bool invertResult = matchedOp == oppositeBinaryOp; bool invertResult = matchedOp == oppositeBinaryOp;
auto methodDef = methodMatcher.mBestMethodDef; auto methodDef = methodMatcher.mBestMethodDef;
auto autoComplete = GetAutoComplete(); auto autoComplete = GetAutoComplete();
bool wasCapturingMethodInfo = false; bool wasCapturingMethodInfo = false;
@ -19908,6 +19903,13 @@ void BfExprEvaluator::PerformBinaryOperation(BfAstNode* leftExpression, BfAstNod
autoComplete->SetDefinitionLocation(operatorDecl->mOpTypeToken); autoComplete->SetDefinitionLocation(operatorDecl->mOpTypeToken);
} }
if ((wasTransformedUsage) && (methodDef->mCommutableKind != BfCommutableKind_Operator))
{
auto error = mModule->Warn(BfWarning_BF4206_OperatorCommutableUsage, "Transformed operator usage requires 'Commutable' attribute to be added to the operator declaration", opToken);
if ((error != NULL) && (methodDef->GetRefNode() != NULL))
mModule->mCompiler->mPassInstance->MoreInfo(StrFormat("See operator declaration"), methodDef->GetRefNode());
}
if (opToken != NULL) if (opToken != NULL)
{ {
if ((opToken->IsA<BfTokenNode>()) && (!noClassify) && (!baseClassWalker.mMayBeFromInterface)) if ((opToken->IsA<BfTokenNode>()) && (!noClassify) && (!baseClassWalker.mMayBeFromInterface))
@ -20049,10 +20051,7 @@ void BfExprEvaluator::PerformBinaryOperation(BfAstNode* leftExpression, BfAstNod
return; return;
} }
} }
if (!foundCommutableOps)
break;
if (pass == 1) if (pass == 1)
break; break;

3
IDEHelper/Compiler/BfSystem.h
View file

@ -1117,7 +1117,8 @@ enum BfWarning
BfWarning_BF4202_TooManyHexForInt = 4202, BfWarning_BF4202_TooManyHexForInt = 4202,
BfWarning_BF4203_UnnecessaryDynamicCast = 4203, BfWarning_BF4203_UnnecessaryDynamicCast = 4203,
BfWarning_BF4204_AddressOfReadOnly = 4204, BfWarning_BF4204_AddressOfReadOnly = 4204,
BfWarning_BF4204_StringInterpolationParam = 4205, BfWarning_BF4205_StringInterpolationParam = 4205,
BfWarning_BF4206_OperatorCommutableUsage = 4206,
BfWarning_C4554_PossiblePrecedenceError = 4554 BfWarning_C4554_PossiblePrecedenceError = 4554
}; };