Merge branch 'main' into issue-567-tlm-packet-cpp

compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentImplWriter.scala

@@ -361,7 +361,8 @@ case class ComponentImplWriter(
       None,
       componentImplClassName,
       Some(s"public $className"),
-      getClassMembers
+      getClassMembers,
+      CppDoc.Class.Final
     )
     hppIncludes :: cppIncludes ::
     wrapInNamespaces(namespaceIdentList, List(cls))

compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/TestWriter/ComponentTestImplWriter.scala

@@ -38,7 +38,8 @@ case class ComponentTestImplWriter(
       None,
       testImplClassName,
       Some(s"public $gTestClassName"),
-      getClassMembers
+      getClassMembers,
+      CppDoc.Class.Final
     )
     List.concat(
       getHppIncludes :: getCppIncludes,

compiler/lib/src/main/scala/codegen/CppWriter/CppDoc.scala

@@ -42,9 +42,14 @@ object CppDoc {
     superclassDecls: Option[String],
     /** The class members */
     members: List[Class.Member],
+    /** The class final qualifier, if any, before the colon */
+    qualifier: Class.FinalQualifier = Class.NonFinal
   )
 
   object Class {
+    sealed trait FinalQualifier
+    case object Final extends FinalQualifier
+    case object NonFinal extends FinalQualifier
     sealed trait Member
     object Member {
       case class Class(c: CppDoc.Class) extends Member

compiler/lib/src/main/scala/codegen/CppWriter/CppDocHppWriter.scala

@@ -60,13 +60,17 @@ object CppDocHppWriter extends CppDocWriter {
   override def visitClass(in: Input, c: CppDoc.Class) = {
     val name = c.name
     val commentLines = CppDocWriter.writeDoxygenCommentOpt(c.comment)
+    val className = c.qualifier match {
+      case CppDoc.Class.Final => s"class $name final"
+      case CppDoc.Class.NonFinal => s"class $name"
+    }
     val openLines = c.superclassDecls match {
       case Some(d) => List(
-        line(s"class $name :"),
+        line(s"$className :"),
         indentIn(line(d)),
         line("{")
       )
-      case None => lines(s"class $name {")
+      case None => lines(s"$className {")
     }
     val bodyLines = {
       val newClassNameList = name :: in.classNameList

compiler/lib/src/main/scala/codegen/CppWriter/CppWriterUtils.scala

@@ -333,13 +333,15 @@ trait CppWriterUtils extends LineUtils {
     name: String,
     superclassDecls: Option[String],
     members: List[CppDoc.Class.Member],
+    qualifier: CppDoc.Class.FinalQualifier = CppDoc.Class.NonFinal
   ): CppDoc.Member.Class =
     CppDoc.Member.Class(
       CppDoc.Class(
         comment,
         name,
         superclassDecls,
-        members
+        members,
+        qualifier
       )
     )
 

compiler/tools/fpp-to-cpp/test/component/impl/ActiveAsyncProductPortsOnly.template.ref.hpp

@@ -9,7 +9,7 @@
 
 #include "ActiveAsyncProductPortsOnlyComponentAc.hpp"
 
-class ActiveAsyncProductPortsOnly :
+class ActiveAsyncProductPortsOnly final :
   public ActiveAsyncProductPortsOnlyComponentBase
 {
 

compiler/tools/fpp-to-cpp/test/component/impl/ActiveAsyncProducts.template.ref.hpp

@@ -9,7 +9,7 @@
 
 #include "ActiveAsyncProductsComponentAc.hpp"
 
-class ActiveAsyncProducts :
+class ActiveAsyncProducts final :
   public ActiveAsyncProductsComponentBase
 {
 

compiler/tools/fpp-to-cpp/test/component/impl/ActiveCommands.template.ref.hpp

@@ -9,7 +9,7 @@
 
 #include "ActiveCommandsComponentAc.hpp"
 
-class ActiveCommands :
+class ActiveCommands final :
   public ActiveCommandsComponentBase
 {
 

compiler/tools/fpp-to-cpp/test/component/impl/ActiveEvents.template.ref.hpp

@@ -9,7 +9,7 @@
 
 #include "ActiveEventsComponentAc.hpp"
 
-class ActiveEvents :
+class ActiveEvents final :
   public ActiveEventsComponentBase
 {
 

compiler/tools/fpp-to-cpp/test/component/impl/ActiveExternalStateMachines.template.ref.hpp

@@ -11,7 +11,7 @@
 
 namespace ExternalSm {
 
-  class ActiveExternalStateMachines :
+  class ActiveExternalStateMachines final :
     public ActiveExternalStateMachinesComponentBase
   {
 

compiler/tools/fpp-to-cpp/test/component/impl/ActiveGetProducts.template.ref.hpp

@@ -9,7 +9,7 @@
 
 #include "ActiveGetProductsComponentAc.hpp"
 
-class ActiveGetProducts :
+class ActiveGetProducts final :
   public ActiveGetProductsComponentBase
 {
 

compiler/tools/fpp-to-cpp/test/component/impl/ActiveGuardedProducts.template.ref.hpp

@@ -9,7 +9,7 @@
 
 #include "ActiveGuardedProductsComponentAc.hpp"
 
-class ActiveGuardedProducts :
+class ActiveGuardedProducts final :
   public ActiveGuardedProductsComponentBase
 {
 

compiler/tools/fpp-to-cpp/test/component/impl/ActiveNoArgsPortsOnly.template.ref.hpp

@@ -9,7 +9,7 @@
 
 #include "ActiveNoArgsPortsOnlyComponentAc.hpp"
 
-class ActiveNoArgsPortsOnly :
+class ActiveNoArgsPortsOnly final :
   public ActiveNoArgsPortsOnlyComponentBase
 {
 

compiler/tools/fpp-to-cpp/test/component/impl/ActiveOverflow.template.ref.hpp

@@ -9,7 +9,7 @@
 
 #include "ActiveOverflowComponentAc.hpp"
 
-class ActiveOverflow :
+class ActiveOverflow final :
   public ActiveOverflowComponentBase
 {
 

compiler/tools/fpp-to-cpp/test/component/impl/ActiveParams.template.ref.hpp

@@ -9,7 +9,7 @@
 
 #include "ActiveParamsComponentAc.hpp"
 
-class ActiveParams :
+class ActiveParams final :
   public ActiveParamsComponentBase
 {
 

compiler/tools/fpp-to-cpp/test/component/impl/ActiveSerial.template.ref.hpp

@@ -9,7 +9,7 @@
 
 #include "ActiveSerialComponentAc.hpp"
 
-class ActiveSerial :
+class ActiveSerial final :
   public ActiveSerialComponentBase
 {
 

compiler/tools/fpp-to-cpp/test/component/impl/ActiveSyncProducts.template.ref.hpp

@@ -9,7 +9,7 @@
 
 #include "ActiveSyncProductsComponentAc.hpp"
 
-class ActiveSyncProducts :
+class ActiveSyncProducts final :
   public ActiveSyncProductsComponentBase
 {
 

compiler/tools/fpp-to-cpp/test/component/impl/ActiveTelemetry.template.ref.hpp

@@ -9,7 +9,7 @@
 
 #include "ActiveTelemetryComponentAc.hpp"
 
-class ActiveTelemetry :
+class ActiveTelemetry final :
   public ActiveTelemetryComponentBase
 {
 

compiler/tools/fpp-to-cpp/test/component/impl/ActiveTest.template.ref.hpp

@@ -11,7 +11,7 @@
 
 namespace M {
 
-  class ActiveTest :
+  class ActiveTest final :
     public ActiveTestComponentBase
   {
 

compiler/tools/fpp-to-cpp/test/component/impl/Empty.template.ref.hpp

@@ -9,7 +9,7 @@
 
 #include "EmptyComponentAc.hpp"
 
-class Empty :
+class Empty final :
   public EmptyComponentBase
 {
 

compiler/tools/fpp-to-cpp/test/component/impl/PassiveCommands.template.ref.hpp

@@ -9,7 +9,7 @@
 
 #include "PassiveCommandsComponentAc.hpp"
 
-class PassiveCommands :
+class PassiveCommands final :
   public PassiveCommandsComponentBase
 {
 

compiler/tools/fpp-to-cpp/test/component/impl/PassiveEvents.template.ref.hpp

@@ -9,7 +9,7 @@
 
 #include "PassiveEventsComponentAc.hpp"
 
-class PassiveEvents :
+class PassiveEvents final :
   public PassiveEventsComponentBase
 {
 

compiler/tools/fpp-to-cpp/test/component/impl/PassiveGetProductPortsOnly.template.ref.hpp

@@ -9,7 +9,7 @@
 
 #include "PassiveGetProductPortsOnlyComponentAc.hpp"
 
-class PassiveGetProductPortsOnly :
+class PassiveGetProductPortsOnly final :
   public PassiveGetProductPortsOnlyComponentBase
 {
 

compiler/tools/fpp-to-cpp/test/component/impl/PassiveGetProducts.template.ref.hpp

@@ -9,7 +9,7 @@
 
 #include "PassiveGetProductsComponentAc.hpp"
 
-class PassiveGetProducts :
+class PassiveGetProducts final :
   public PassiveGetProductsComponentBase
 {
 

compiler/tools/fpp-to-cpp/test/component/impl/PassiveGuardedProducts.template.ref.hpp

@@ -9,7 +9,7 @@
 
 #include "PassiveGuardedProductsComponentAc.hpp"
 
-class PassiveGuardedProducts :
+class PassiveGuardedProducts final :
   public PassiveGuardedProductsComponentBase
 {
 

compiler/tools/fpp-to-cpp/test/component/impl/PassiveParams.template.ref.hpp

@@ -9,7 +9,7 @@
 
 #include "PassiveParamsComponentAc.hpp"
 
-class PassiveParams :
+class PassiveParams final :
   public PassiveParamsComponentBase
 {
 

compiler/tools/fpp-to-cpp/test/component/impl/PassiveSerial.template.ref.hpp

@@ -9,7 +9,7 @@
 
 #include "PassiveSerialComponentAc.hpp"
 
-class PassiveSerial :
+class PassiveSerial final :
   public PassiveSerialComponentBase
 {
 

compiler/tools/fpp-to-cpp/test/component/impl/PassiveSyncProductPortsOnly.template.ref.hpp

@@ -9,7 +9,7 @@
 
 #include "PassiveSyncProductPortsOnlyComponentAc.hpp"
 
-class PassiveSyncProductPortsOnly :
+class PassiveSyncProductPortsOnly final :
   public PassiveSyncProductPortsOnlyComponentBase
 {
 

compiler/tools/fpp-to-cpp/test/component/impl/PassiveSyncProducts.template.ref.hpp

@@ -9,7 +9,7 @@
 
 #include "PassiveSyncProductsComponentAc.hpp"
 
-class PassiveSyncProducts :
+class PassiveSyncProducts final :
   public PassiveSyncProductsComponentBase
 {
 

compiler/tools/fpp-to-cpp/test/component/impl/PassiveTelemetry.template.ref.hpp

@@ -9,7 +9,7 @@
 
 #include "PassiveTelemetryComponentAc.hpp"
 
-class PassiveTelemetry :
+class PassiveTelemetry final :
   public PassiveTelemetryComponentBase
 {
 

compiler/tools/fpp-to-cpp/test/component/impl/PassiveTest.template.ref.hpp

@@ -9,7 +9,7 @@
 
 #include "PassiveTestComponentAc.hpp"
 
-class PassiveTest :
+class PassiveTest final :
   public PassiveTestComponentBase
 {
 

compiler/tools/fpp-to-cpp/test/component/impl/QueuedAsyncProductPortsOnly.template.ref.hpp

@@ -9,7 +9,7 @@
 
 #include "QueuedAsyncProductPortsOnlyComponentAc.hpp"
 
-class QueuedAsyncProductPortsOnly :
+class QueuedAsyncProductPortsOnly final :
   public QueuedAsyncProductPortsOnlyComponentBase
 {
 

compiler/tools/fpp-to-cpp/test/component/impl/QueuedAsyncProducts.template.ref.hpp

@@ -9,7 +9,7 @@
 
 #include "QueuedAsyncProductsComponentAc.hpp"
 
-class QueuedAsyncProducts :
+class QueuedAsyncProducts final :
   public QueuedAsyncProductsComponentBase
 {
 

compiler/tools/fpp-to-cpp/test/component/impl/QueuedCommands.template.ref.hpp

@@ -9,7 +9,7 @@
 
 #include "QueuedCommandsComponentAc.hpp"
 
-class QueuedCommands :
+class QueuedCommands final :
   public QueuedCommandsComponentBase
 {
 

compiler/tools/fpp-to-cpp/test/component/impl/QueuedEvents.template.ref.hpp

@@ -9,7 +9,7 @@
 
 #include "QueuedEventsComponentAc.hpp"
 
-class QueuedEvents :
+class QueuedEvents final :
   public QueuedEventsComponentBase
 {
 

compiler/tools/fpp-to-cpp/test/component/impl/QueuedGetProducts.template.ref.hpp

@@ -9,7 +9,7 @@
 
 #include "QueuedGetProductsComponentAc.hpp"
 
-class QueuedGetProducts :
+class QueuedGetProducts final :
   public QueuedGetProductsComponentBase
 {
 

compiler/tools/fpp-to-cpp/test/component/impl/QueuedGuardedProducts.template.ref.hpp

@@ -9,7 +9,7 @@
 
 #include "QueuedGuardedProductsComponentAc.hpp"
 
-class QueuedGuardedProducts :
+class QueuedGuardedProducts final :
   public QueuedGuardedProductsComponentBase
 {
 

compiler/tools/fpp-to-cpp/test/component/impl/QueuedNoArgsPortsOnly.template.ref.hpp

@@ -9,7 +9,7 @@
 
 #include "QueuedNoArgsPortsOnlyComponentAc.hpp"
 
-class QueuedNoArgsPortsOnly :
+class QueuedNoArgsPortsOnly final :
   public QueuedNoArgsPortsOnlyComponentBase
 {
 

compiler/tools/fpp-to-cpp/test/component/impl/QueuedOverflow.template.ref.hpp

@@ -9,7 +9,7 @@
 
 #include "QueuedOverflowComponentAc.hpp"
 
-class QueuedOverflow :
+class QueuedOverflow final :
   public QueuedOverflowComponentBase
 {
 

compiler/tools/fpp-to-cpp/test/component/impl/QueuedParams.template.ref.hpp

@@ -9,7 +9,7 @@
 
 #include "QueuedParamsComponentAc.hpp"
 
-class QueuedParams :
+class QueuedParams final :
   public QueuedParamsComponentBase
 {
 

compiler/tools/fpp-to-cpp/test/component/impl/QueuedSerial.template.ref.hpp

@@ -9,7 +9,7 @@
 
 #include "QueuedSerialComponentAc.hpp"
 
-class QueuedSerial :
+class QueuedSerial final :
   public QueuedSerialComponentBase
 {