Refactor operatorChildToString

fintarin · Oct 25, 2023 · 60965d4 · 60965d4
1 parent e9ef065
commit 60965d4
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git a/src/fintamath/expressions/ExpressionUtils.cpp b/src/fintamath/expressions/ExpressionUtils.cpp
@@ -75,13 +75,16 @@ std::string operatorChildToString(const IOperator &oper, const ArgumentPtr &chil
   bool shouldPutInBrackets = false;
 
   if (childOper) {
-    shouldPutInBrackets = oper.getOperatorPriority() == IOperator::Priority::PostfixUnary ||
-                          childOper->getOperatorPriority() > oper.getOperatorPriority();
-
-    shouldPutInBrackets = shouldPutInBrackets ||
-                          (childOper->getFunctionType() == IFunction::Type::Unary
-                               ? childOper->getOperatorPriority() == oper.getOperatorPriority()
-                               : !oper.isAssociative());
+    if (oper.getOperatorPriority() == IOperator::Priority::PostfixUnary) {
+      shouldPutInBrackets = true;
+    }
+    else if (childOper->getFunctionType() == IFunction::Type::Unary) {
+      shouldPutInBrackets = childOper->getOperatorPriority() >= oper.getOperatorPriority();
+    }
+    else {
+      shouldPutInBrackets = childOper->getOperatorPriority() > oper.getOperatorPriority() ||
+                            !oper.isAssociative();
+    }
   }
 
   return shouldPutInBrackets ? putInBrackets(childStr) : childStr;

diff --git a/src/fintamath/expressions/binary/DivExpression.cpp b/src/fintamath/expressions/binary/DivExpression.cpp
@@ -33,7 +33,7 @@ DivExpression::DivExpression(ArgumentPtr inLhsChild, ArgumentPtr inRhsChild)
 }
 
 std::string DivExpression::toString() const {
-  if (isNegated(lhsChild)) {
+  if (isNegated(lhsChild)) { // TODO: find more efficient solution
     ArgumentPtr innerDiv = divExpr(negExpr(lhsChild)->toMinimalObject(), rhsChild);
     return negExpr(innerDiv)->toString();
   }