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

Fixed unary '+' overload

Browse source
This commit is contained in:
Brian Fiete 2020-08-29 07:08:37 -07:00
parent 6975d1ce40
commit 783bdb15be
1 changed files with 13 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

22
IDEHelper/Compiler/BfReducer.cpp
View file

@ -2174,10 +2174,7 @@ BfExpression* BfReducer::CreateExpression(BfAstNode* node, CreateExprFlags creat
BfUnaryOp unaryOp = BfTokenToUnaryOp(tokenNode->GetToken()); BfUnaryOp unaryOp = BfTokenToUnaryOp(tokenNode->GetToken());
if (unaryOp != BfUnaryOp_None) if (unaryOp != BfUnaryOp_None)
{ {
if (unaryOp == BfUnaryOp_Positive)
Fail("Unary operator '+' not allowed", tokenNode);
unaryOpExpr = mAlloc->Alloc<BfUnaryOperatorExpression>(); unaryOpExpr = mAlloc->Alloc<BfUnaryOperatorExpression>();
unaryOpExpr->mOp = unaryOp; unaryOpExpr->mOp = unaryOp;
unaryOpExpr->mOpToken = tokenNode; unaryOpExpr->mOpToken = tokenNode;
@ -6625,12 +6622,19 @@ BfAstNode* BfReducer::ReadTypeMember(BfAstNode* node, int depth)
} }
ParseMethod(operatorDecl, &params, &commas); ParseMethod(operatorDecl, &params, &commas);
// This was the one ambiguous case if (params.size() == 1)
if ((operatorDecl->mBinOp == BfBinaryOp_Subtract) && (params.size() == 1))
{ {
operatorDecl->mBinOp = BfBinaryOp_None; if (operatorDecl->mBinOp == BfBinaryOp_Add)
operatorDecl->mUnaryOp = BfUnaryOp_Negate; {
operatorDecl->mBinOp = BfBinaryOp_None;
operatorDecl->mUnaryOp = BfUnaryOp_Positive;
}
else if (operatorDecl->mBinOp == BfBinaryOp_Subtract)
{
operatorDecl->mBinOp = BfBinaryOp_None;
operatorDecl->mUnaryOp = BfUnaryOp_Negate;
}
} }
return operatorDecl; return operatorDecl;