From e0115e06c04bb551bd4aa473119e3f37624c6d1e Mon Sep 17 00:00:00 2001 From: Jan Bylicki <47863101+jbylicki@users.noreply.github.com> Date: Tue, 27 Jun 2023 12:21:47 +0200 Subject: [PATCH] tree_unwrapper.cc: Optimized policy search condition checks Co-authored-by: Mariusz Glebocki --- verilog/formatting/tree_unwrapper.cc | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/verilog/formatting/tree_unwrapper.cc b/verilog/formatting/tree_unwrapper.cc index a6d2934281..b8f8f5cf18 100644 --- a/verilog/formatting/tree_unwrapper.cc +++ b/verilog/formatting/tree_unwrapper.cc @@ -863,14 +863,13 @@ void TreeUnwrapper::SetIndentationsAndCreatePartitions( break; } case NodeEnum::kDataDeclaration: { - if ((GetParamListFromDataDeclaration(node) || - !SearchSyntaxTree(node, NodekPortActualList()).empty()) && - style_.always_wrap_module_instantiations) { - VisitIndentedSection(node, 0, PartitionPolicyEnum::kAlwaysExpand); - } else { - VisitIndentedSection(node, 0, - PartitionPolicyEnum::kFitOnLineElseExpand); - } + const auto policy = + (style_.always_wrap_module_instantiations && + (GetParamListFromDataDeclaration(node) || + !SearchSyntaxTree(node, NodekPortActualList()).empty())) + ? PartitionPolicyEnum::kAlwaysExpand + : PartitionPolicyEnum::kFitOnLineElseExpand; + VisitIndentedSection(node, 0, policy); break; }