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

Fixed operator precedence issue

Browse source
This commit is contained in:
Brian Fiete 2020-07-02 23:34:17 -07:00
parent 9f04792baa
commit 2bfc9d2d98
2 changed files with 17 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

19
IDEHelper/Compiler/BfReducer.cpp
View file

@ -1068,6 +1068,7 @@ static String DbgNodeToString(BfAstNode* astNode)
else if (auto condExpr = BfNodeDynCast<BfConditionalExpression>(astNode)) else if (auto condExpr = BfNodeDynCast<BfConditionalExpression>(astNode))
{ {
String str; String str;
str += "( ";
str += "("; str += "(";
str += DbgNodeToString(condExpr->mConditionExpression); str += DbgNodeToString(condExpr->mConditionExpression);
str += ") ? ("; str += ") ? (";
@ -1075,6 +1076,7 @@ static String DbgNodeToString(BfAstNode* astNode)
str += ") : ("; str += ") : (";
str += DbgNodeToString(condExpr->mFalseExpression); str += DbgNodeToString(condExpr->mFalseExpression);
str += ")"; str += ")";
str += " )";
return str; return str;
} }
@ -2180,7 +2182,8 @@ BfExpression* BfReducer::CreateExpression(BfAstNode* node, CreateExprFlags creat
unaryOpExpr->mOp = unaryOp; unaryOpExpr->mOp = unaryOp;
unaryOpExpr->mOpToken = tokenNode; unaryOpExpr->mOpToken = tokenNode;
ReplaceNode(tokenNode, unaryOpExpr); ReplaceNode(tokenNode, unaryOpExpr);
unaryOpExpr->mExpression = CreateExpressionAfter(unaryOpExpr, rhsCreateExprFlags); // Don't attempt binary or unary operations- they will always be lower precedence
unaryOpExpr->mExpression = CreateExpressionAfter(unaryOpExpr, (CreateExprFlags)(rhsCreateExprFlags | CreateExprFlags_EarlyExit));
if (unaryOpExpr->mExpression == NULL) if (unaryOpExpr->mExpression == NULL)
return NULL; return NULL;
MoveNode(unaryOpExpr->mExpression, unaryOpExpr); MoveNode(unaryOpExpr->mExpression, unaryOpExpr);
@ -2269,7 +2272,7 @@ BfExpression* BfReducer::CreateExpression(BfAstNode* node, CreateExprFlags creat
if (((createExprFlags & CreateExprFlags_BreakOnRChevron) != 0) && (token == BfToken_RChevron)) if (((createExprFlags & CreateExprFlags_BreakOnRChevron) != 0) && (token == BfToken_RChevron))
return exprLeft; return exprLeft;
if ((token == BfToken_DblPlus) || (token == BfToken_DblMinus)) if ((token == BfToken_DblPlus) || (token == BfToken_DblMinus))
{ {
// Post-increment, post-decrement // Post-increment, post-decrement
@ -2284,7 +2287,7 @@ BfExpression* BfReducer::CreateExpression(BfAstNode* node, CreateExprFlags creat
} }
if (token == BfToken_As) if (token == BfToken_As)
{ {
auto dynCastExpr = mAlloc->Alloc<BfDynamicCastExpression>(); auto dynCastExpr = mAlloc->Alloc<BfDynamicCastExpression>();
ReplaceNode(exprLeft, dynCastExpr); ReplaceNode(exprLeft, dynCastExpr);
dynCastExpr->mTarget = exprLeft; dynCastExpr->mTarget = exprLeft;
@ -2298,7 +2301,7 @@ BfExpression* BfReducer::CreateExpression(BfAstNode* node, CreateExprFlags creat
} }
if (token == BfToken_Is) if (token == BfToken_Is)
{ {
auto checkTypeExpr = mAlloc->Alloc<BfCheckTypeExpression>(); auto checkTypeExpr = mAlloc->Alloc<BfCheckTypeExpression>();
ReplaceNode(exprLeft, checkTypeExpr); ReplaceNode(exprLeft, checkTypeExpr);
checkTypeExpr->mTarget = exprLeft; checkTypeExpr->mTarget = exprLeft;
@ -2314,6 +2317,8 @@ BfExpression* BfReducer::CreateExpression(BfAstNode* node, CreateExprFlags creat
if (token == BfToken_Question) if (token == BfToken_Question)
{ {
if ((createExprFlags & CreateExprFlags_EarlyExit) != 0)
return exprLeft;
auto conditionExpr = mAlloc->Alloc<BfConditionalExpression>(); auto conditionExpr = mAlloc->Alloc<BfConditionalExpression>();
ReplaceNode(exprLeft, conditionExpr); ReplaceNode(exprLeft, conditionExpr);
conditionExpr->mConditionExpression = exprLeft; conditionExpr->mConditionExpression = exprLeft;
@ -2340,6 +2345,8 @@ BfExpression* BfReducer::CreateExpression(BfAstNode* node, CreateExprFlags creat
if ((token == BfToken_Case) && ((createExprFlags & CreateStmtFlags_NoCaseExpr) == 0)) if ((token == BfToken_Case) && ((createExprFlags & CreateStmtFlags_NoCaseExpr) == 0))
{ {
if ((createExprFlags & CreateExprFlags_EarlyExit) != 0)
return exprLeft;
// If we have a ".Member case <XXX>" expression, that is an invalid construct. We bail out here // If we have a ".Member case <XXX>" expression, that is an invalid construct. We bail out here
// because it allows the ".Member" to autocomplete because we will treat it as a full expression instead // because it allows the ".Member" to autocomplete because we will treat it as a full expression instead
// of making it the target of an illegal expression // of making it the target of an illegal expression
@ -2581,6 +2588,8 @@ BfExpression* BfReducer::CreateExpression(BfAstNode* node, CreateExprFlags creat
BfBinaryOp binOp = BfTokenToBinaryOp(tokenNode->GetToken()); BfBinaryOp binOp = BfTokenToBinaryOp(tokenNode->GetToken());
if (binOp != BfBinaryOp_None) if (binOp != BfBinaryOp_None)
{ {
if ((createExprFlags & CreateExprFlags_EarlyExit) != 0)
return exprLeft;
auto binOpExpression = mAlloc->Alloc<BfBinaryOperatorExpression>(); auto binOpExpression = mAlloc->Alloc<BfBinaryOperatorExpression>();
ReplaceNode(exprLeft, binOpExpression); ReplaceNode(exprLeft, binOpExpression);
binOpExpression->mLeft = exprLeft; binOpExpression->mLeft = exprLeft;
@ -2605,6 +2614,8 @@ BfExpression* BfReducer::CreateExpression(BfAstNode* node, CreateExprFlags creat
auto assignmentOp = BfTokenToAssignmentOp(tokenNode->GetToken()); auto assignmentOp = BfTokenToAssignmentOp(tokenNode->GetToken());
if (assignmentOp != BfAssignmentOp_None) if (assignmentOp != BfAssignmentOp_None)
{ {
if ((createExprFlags & CreateExprFlags_EarlyExit) != 0)
return exprLeft;
if ((createExprFlags & CreateExprFlags_NoAssignment) != 0) if ((createExprFlags & CreateExprFlags_NoAssignment) != 0)
return exprLeft; return exprLeft;

3
IDEHelper/Compiler/BfReducer.h
View file

@ -25,7 +25,8 @@ public:
CreateExprFlags_ExitOnBang = 0x40, CreateExprFlags_ExitOnBang = 0x40,
CreateExprFlags_ExitOnParenExpr = 0x80, CreateExprFlags_ExitOnParenExpr = 0x80,
CreateExprFlags_NoCheckBinOpPrecedence = 0x100, CreateExprFlags_NoCheckBinOpPrecedence = 0x100,
CreateExprFlags_BreakOnCascade = 0x200 CreateExprFlags_BreakOnCascade = 0x200,
CreateExprFlags_EarlyExit = 0x400 // Don't attempt binary or ternary operations
}; };
enum CreateStmtFlags enum CreateStmtFlags