append(format("\n%s}", string(brace_indent*2, ' ')));
}
-void Formatter::visit(Literal &literal)
+void Formatter::visit_expression(Expression &expr, const Operator *outer_oper, bool on_rhs)
{
- append(literal.token);
+ unsigned outer_precedence = (outer_oper ? outer_oper->precedence : 20);
+ unsigned inner_precedence = (expr.oper ? expr.oper->precedence : 0);
+
+ bool needs_parentheses = (inner_precedence>=outer_precedence);
+
+ // Omit parentheses if the outer operator encloses this operand.
+ if(outer_oper && outer_oper->type==Operator::BINARY && outer_oper->token2[0] && on_rhs)
+ needs_parentheses = false;
+
+ if(expr.oper)
+ {
+ /* Omit parentheses if the inner expression's operator sits between the
+ expression and the outer operator. */
+ bool oper_on_left = expr.oper->type==Operator::PREFIX;
+ bool oper_on_right = expr.oper->type==Operator::POSTFIX || (expr.oper->type==Operator::BINARY && expr.oper->token2[0]);
+ if(expr.oper && ((oper_on_left && on_rhs) || (oper_on_right && !on_rhs)))
+ needs_parentheses = false;
+
+ // Omit parentheses if the operator's natural grouping works out.
+ if(expr.oper==outer_oper)
+ needs_parentheses = (expr.oper->assoc!=Operator::ASSOCIATIVE && on_rhs!=(expr.oper->assoc==Operator::RIGHT_TO_LEFT));
+ }
+
+ if(needs_parentheses)
+ append('(');
+ expr.visit(*this);
+ if(needs_parentheses)
+ append(')');
}
-void Formatter::visit(ParenthesizedExpression &parexpr)
+void Formatter::visit(Literal &literal)
{
- append('(');
- parexpr.expression->visit(*this);
- append(')');
+ append(literal.token);
}
void Formatter::visit(VariableReference &var)
void Formatter::visit(MemberAccess &memacc)
{
- memacc.left->visit(*this);
+ visit_expression(*memacc.left, memacc.oper, false);
append(format(".%s", memacc.member));
}
void Formatter::visit(Swizzle &swizzle)
{
- swizzle.left->visit(*this);
+ visit_expression(*swizzle.left, swizzle.oper, false);
append(format(".%s", swizzle.component_group));
}
{
if(unary.oper->type==Operator::PREFIX)
append(unary.oper->token);
- unary.expression->visit(*this);
+ visit_expression(*unary.expression, unary.oper, unary.oper->type==Operator::PREFIX);
if(unary.oper->type==Operator::POSTFIX)
append(unary.oper->token);
}
void Formatter::visit(BinaryExpression &binary)
{
- binary.left->visit(*this);
+ visit_expression(*binary.left, binary.oper, false);
append(binary.oper->token);
- binary.right->visit(*this);
- if(binary.oper->token[0]=='[')
- append(']');
+ visit_expression(*binary.right, binary.oper, true);
+ if(binary.oper->token2[0])
+ append(binary.oper->token2);
}
void Formatter::visit(Assignment &assign)
{
- assign.left->visit(*this);
+ visit_expression(*assign.left, assign.oper, false);
append(format(" %s ", assign.oper->token));
- assign.right->visit(*this);
+ visit_expression(*assign.right, assign.oper, true);
}
void Formatter::visit(TernaryExpression &ternary)
{
- ternary.condition->visit(*this);
+ visit_expression(*ternary.condition, ternary.oper, false);
append(ternary.oper->token);
- ternary.true_expr->visit(*this);
- if(ternary.oper->token[0]=='?')
- append(':');
- ternary.false_expr->visit(*this);
+ visit_expression(*ternary.true_expr, ternary.oper, false);
+ if(ternary.oper->token2)
+ append(ternary.oper->token2);
+ visit_expression(*ternary.false_expr, ternary.oper, true);
}
void Formatter::visit(FunctionCall &call)
void Formatter::visit(InterfaceBlock &iface)
{
- append(format("%s %s\n", iface.interface, iface.name));
+ if(iface.layout)
+ {
+ iface.layout->visit(*this);
+ append(' ');
+ }
+ append(format("%s %s\n", iface.interface, iface.block_name));
if(iface.struct_declaration)
iface.struct_declaration->members.visit(*this);
if(!iface.instance_name.empty())