Revise topology code gen

bocchino · bocchino · commit b0f83ec0f105 · 2025-03-31T16:04:39.000-07:00
Remove blank lines
diff --git a/compiler/lib/src/main/scala/codegen/CppWriter/TopologyCppWriter/TopologyCppWriter.scala b/compiler/lib/src/main/scala/codegen/CppWriter/TopologyCppWriter/TopologyCppWriter.scala
@@ -66,7 +66,7 @@ case class TopologyCppWriter(
       TopConfigObjects(s, aNode).getHppLines
     )
     val cppLines = linesMember(
-      Line.blank :: addBlankPostfix(TopConfigObjects(s, aNode).getCppLines),
+      TopConfigObjects(s, aNode).getCppLines,
       CppDoc.Lines.Cpp
     )
     val (helperFnNames, helperFns) = TopHelperFns(s, aNode).getMembers
diff --git a/compiler/tools/fpp-to-cpp/test/top/BasicTopologyAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/top/BasicTopologyAc.ref.cpp
@@ -37,7 +37,6 @@ M::Active active1(FW_OPTIONAL_NAME("active1"));
 
 namespace M {
 
-
   // ----------------------------------------------------------------------
   // Component configuration objects
   // ----------------------------------------------------------------------
@@ -50,7 +49,6 @@ namespace M {
 
   }
 
-
   // ----------------------------------------------------------------------
   // Helper functions
   // ----------------------------------------------------------------------
diff --git a/compiler/tools/fpp-to-cpp/test/top/CommandsTopologyAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/top/CommandsTopologyAc.ref.cpp
@@ -24,7 +24,6 @@ namespace M {
 
 namespace M {
 
-
   // ----------------------------------------------------------------------
   // Helper functions
   // ----------------------------------------------------------------------
diff --git a/compiler/tools/fpp-to-cpp/test/top/HealthTopologyAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/top/HealthTopologyAc.ref.cpp
@@ -30,7 +30,6 @@ namespace M {
 
 namespace M {
 
-
   // ----------------------------------------------------------------------
   // Component configuration objects
   // ----------------------------------------------------------------------
@@ -54,7 +53,6 @@ namespace M {
 
   }
 
-
   // ----------------------------------------------------------------------
   // Helper functions
   // ----------------------------------------------------------------------
diff --git a/compiler/tools/fpp-to-cpp/test/top/NestedNamespacesTopologyAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/top/NestedNamespacesTopologyAc.ref.cpp
@@ -14,7 +14,6 @@ M::N::O::C c(FW_OPTIONAL_NAME("c"));
 
 namespace M {
 
-
   // ----------------------------------------------------------------------
   // Helper functions
   // ----------------------------------------------------------------------
diff --git a/compiler/tools/fpp-to-cpp/test/top/NoInstancesTopologyAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/top/NoInstancesTopologyAc.ref.cpp
@@ -6,7 +6,6 @@
 
 #include "NoInstancesTopologyAc.hpp"
 
-
 // ----------------------------------------------------------------------
 // Helper functions
 // ----------------------------------------------------------------------
diff --git a/compiler/tools/fpp-to-cpp/test/top/NoNamespaceTopologyAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/top/NoNamespaceTopologyAc.ref.cpp
@@ -6,7 +6,6 @@
 
 #include "NoNamespaceTopologyAc.hpp"
 
-
 // ----------------------------------------------------------------------
 // Helper functions
 // ----------------------------------------------------------------------
diff --git a/compiler/tools/fpp-to-cpp/test/top/OneInstanceTopologyAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/top/OneInstanceTopologyAc.ref.cpp
@@ -18,7 +18,6 @@ namespace M {
 
 namespace M {
 
-
   // ----------------------------------------------------------------------
   // Helper functions
   // ----------------------------------------------------------------------
diff --git a/compiler/tools/fpp-to-cpp/test/top/ParamsTopologyAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/top/ParamsTopologyAc.ref.cpp
@@ -24,7 +24,6 @@ namespace M {
 
 namespace M {
 
-
   // ----------------------------------------------------------------------
   // Helper functions
   // ----------------------------------------------------------------------
diff --git a/compiler/tools/fpp-to-cpp/test/top/TwoInstancesTopologyAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/top/TwoInstancesTopologyAc.ref.cpp
@@ -24,7 +24,6 @@ namespace M {
 
 namespace N {
 
-
   // ----------------------------------------------------------------------
   // Helper functions
   // ----------------------------------------------------------------------

Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ case class TopologyCppWriter(`
`66`	`66`	`TopConfigObjects(s, aNode).getHppLines`
`67`	`67`	`)`
`68`	`68`	`val cppLines = linesMember(`
`69`		`- Line.blank :: addBlankPostfix(TopConfigObjects(s, aNode).getCppLines),`
	`69`	`+ TopConfigObjects(s, aNode).getCppLines,`
`70`	`70`	`CppDoc.Lines.Cpp`
`71`	`71`	`)`
`72`	`72`	`val (helperFnNames, helperFns) = TopHelperFns(s, aNode).getMembers`