tree_unwrapper.cc: Optimized policy search condition checks

Co-authored-by: Mariusz Glebocki <[email protected]>
chipsalliance · Jun 27, 2023 · e0115e0 · e0115e0
1 parent 8b72f45
commit e0115e0
Showing 1 changed file with 7 additions and 8 deletions.
diff --git 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;
     }