Revise header files in generated C++

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

@@ -8,11 +8,7 @@ import fpp.compiler.util._
 case class ArrayCppWriter (
   s: CppWriterState,
   aNode: Ast.Annotated[AstNode[Ast.DefArray]]
-) extends AstVisitor with CppWriterLineUtils {
+) extends CppWriterLineUtils {
-
-  type In = CppWriterState
-
-  type Out = List[Line]
 
   private val node = aNode._2
 
@@ -46,12 +42,10 @@ case class ArrayCppWriter (
     data.eltType
   )
 
-  override def default(s: CppWriterState): List[Line] = Nil
+  private def writeIncludeDirectives(
-
-  override def defArrayAnnotatedNode(
     s: CppWriterState,
     aNode: Ast.Annotated[AstNode[Ast.DefArray]]
-  ): List[Line] = {
+  ): List[String] = {
     val Right(a) = UsedSymbols.defArrayAnnotatedNode(s.a, aNode)
     s.writeIncludeDirectives(a.usedSymbolSet)
   }
@@ -93,19 +87,14 @@ case class ArrayCppWriter (
   }
 
   private def getHppIncludes: CppDoc.Member = {
-    val strings = List(
+    val standardHeaders = List(
       "Fw/Types/BasicTypes.hpp",
       "Fw/Types/Serializable.hpp",
       "Fw/Types/String.hpp"
-    )
+    ).map(CppWriter.headerString)
-    CppWriter.linesMember(
+    val symbolHeaders = writeIncludeDirectives(s, aNode)
-      List(
+    val headers = standardHeaders ++ symbolHeaders
-        Line.blank ::
+    CppWriter.linesMember(addBlankPrefix(headers.sorted.map(line)))
-          strings.map(CppWriter.headerString).map(line),
-        Line.blank ::
-          defArrayAnnotatedNode(s, aNode),
-      ).flatten
-    )
   }
 
   private def getCppIncludes: CppDoc.Member = {

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

@@ -129,7 +129,7 @@ case class CppWriterState(
   }
 
   /** Write include directives as lines */
-  def writeIncludeDirectives(usedSymbols: Iterable[Symbol]): List[Line] = {
+  def writeIncludeDirectives(usedSymbols: Iterable[Symbol]): List[String] = {
     def getHeaderStr(file: File.JavaPath) =
       CppWriter.headerString(s"${file.toString}.hpp")
     def getDirectiveforSymbol(sym: Symbol): Option[String] = sym match {
@@ -143,9 +143,6 @@ case class CppWriterState(
       case Symbol.Component(node) => Some(
         getHeaderStr(getRelativePath(ComputeCppFiles.FileNames.getComponent(getName(Symbol.Component(node)))))
       )
-      case Symbol.Constant(_) => Some(
-        getHeaderStr(getRelativePath(ComputeCppFiles.FileNames.getConstants))
-      )
       case Symbol.Enum(node) => Some(
         getHeaderStr(getRelativePath(ComputeCppFiles.FileNames.getEnum(getName(Symbol.Enum(node)))))
       )
@@ -161,10 +158,7 @@ case class CppWriterState(
       case _ => None
     }
 
-    usedSymbols.map(getDirectiveforSymbol).filter(_.isDefined).map(_.get).toList match {
+    usedSymbols.map(getDirectiveforSymbol).filter(_.isDefined).map(_.get).toList
-      case Nil => Nil
-      case strings => strings.map(Line(_))
-    }
   }
 
   /** Is this a built-in type? */

compiler/tools/fpp-to-cpp/test/array/AbsTypeArrayAc.ref.hpp

@@ -10,7 +10,6 @@
 #include "Fw/Types/BasicTypes.hpp"
 #include "Fw/Types/Serializable.hpp"
 #include "Fw/Types/String.hpp"
-
 #include "T.hpp"
 
 //! An array of abstract type

compiler/tools/fpp-to-cpp/test/array/BuiltInTypeArrayAc.ref.hpp

@@ -11,7 +11,6 @@
 #include "Fw/Types/Serializable.hpp"
 #include "Fw/Types/String.hpp"
 
-
 //! An array of a built-in type
 class BuiltInType :
   public Fw::Serializable

compiler/tools/fpp-to-cpp/test/array/Enum1ArrayAc.ref.hpp

@@ -7,12 +7,11 @@
 #ifndef Enum1ArrayAc_HPP
 #define Enum1ArrayAc_HPP
 
+#include "E1EnumAc.hpp"
 #include "Fw/Types/BasicTypes.hpp"
 #include "Fw/Types/Serializable.hpp"
 #include "Fw/Types/String.hpp"
 
-#include "E1EnumAc.hpp"
-
 //! Array with enum argument
 class Enum1 :
   public Fw::Serializable

compiler/tools/fpp-to-cpp/test/array/Enum2ArrayAc.ref.hpp

@@ -7,12 +7,11 @@
 #ifndef Enum2ArrayAc_HPP
 #define Enum2ArrayAc_HPP
 
+#include "E2EnumAc.hpp"
 #include "Fw/Types/BasicTypes.hpp"
 #include "Fw/Types/Serializable.hpp"
 #include "Fw/Types/String.hpp"
 
-#include "E2EnumAc.hpp"
-
 class Enum2 :
   public Fw::Serializable
 {

compiler/tools/fpp-to-cpp/test/array/PrimitiveArrayArrayAc.ref.hpp

@@ -10,7 +10,6 @@
 #include "Fw/Types/BasicTypes.hpp"
 #include "Fw/Types/Serializable.hpp"
 #include "Fw/Types/String.hpp"
-
 #include "PrimitiveF64ArrayAc.hpp"
 
 //! An array of arrays

compiler/tools/fpp-to-cpp/test/array/PrimitiveBoolArrayAc.ref.hpp

@@ -11,8 +11,6 @@
 #include "Fw/Types/Serializable.hpp"
 #include "Fw/Types/String.hpp"
 
-#include "FppConstantsAc.hpp"
-
 namespace M {
 
   class PrimitiveBool :

compiler/tools/fpp-to-cpp/test/array/PrimitiveF32eArrayAc.ref.hpp

@@ -11,8 +11,6 @@
 #include "Fw/Types/Serializable.hpp"
 #include "Fw/Types/String.hpp"
 
-#include "FppConstantsAc.hpp"
-
 namespace M {
 
   //! An array of F32 with default value and format string

compiler/tools/fpp-to-cpp/test/array/PrimitiveF32fArrayAc.ref.hpp

@@ -11,8 +11,6 @@
 #include "Fw/Types/Serializable.hpp"
 #include "Fw/Types/String.hpp"
 
-#include "FppConstantsAc.hpp"
-
 namespace M {
 
   //! An array of F32 with format string

compiler/tools/fpp-to-cpp/test/array/PrimitiveF64ArrayAc.ref.hpp

@@ -11,8 +11,6 @@
 #include "Fw/Types/Serializable.hpp"
 #include "Fw/Types/String.hpp"
 
-#include "FppConstantsAc.hpp"
-
 namespace M {
 
   //! An array of F64 with default value and format string

compiler/tools/fpp-to-cpp/test/array/PrimitiveI32ArrayAc.ref.hpp

@@ -11,8 +11,6 @@
 #include "Fw/Types/Serializable.hpp"
 #include "Fw/Types/String.hpp"
 
-#include "FppConstantsAc.hpp"
-
 namespace M {
 
   //! An array of I32 with format string

compiler/tools/fpp-to-cpp/test/array/PrimitiveI64ArrayAc.ref.hpp

@@ -11,8 +11,6 @@
 #include "Fw/Types/Serializable.hpp"
 #include "Fw/Types/String.hpp"
 
-#include "FppConstantsAc.hpp"
-
 namespace M {
 
   //! An array of I64 with format string

compiler/tools/fpp-to-cpp/test/array/PrimitiveU16ArrayAc.ref.hpp

@@ -11,8 +11,6 @@
 #include "Fw/Types/Serializable.hpp"
 #include "Fw/Types/String.hpp"
 
-#include "FppConstantsAc.hpp"
-
 namespace M {
 
   class PrimitiveU16 :

compiler/tools/fpp-to-cpp/test/array/PrimitiveU8ArrayAc.ref.hpp

@@ -11,8 +11,6 @@
 #include "Fw/Types/Serializable.hpp"
 #include "Fw/Types/String.hpp"
 
-#include "FppConstantsAc.hpp"
-
 namespace M {
 
   class PrimitiveU8 :

compiler/tools/fpp-to-cpp/test/array/String1ArrayAc.ref.hpp

@@ -11,7 +11,6 @@
 #include "Fw/Types/Serializable.hpp"
 #include "Fw/Types/String.hpp"
 
-
 //! An array of strings
 class String1 :
   public Fw::Serializable

compiler/tools/fpp-to-cpp/test/array/String2ArrayAc.ref.hpp

@@ -11,7 +11,6 @@
 #include "Fw/Types/Serializable.hpp"
 #include "Fw/Types/String.hpp"
 
-
 //! An array of strings with specified default value and format string
 class String2 :
   public Fw::Serializable

compiler/tools/fpp-to-cpp/test/array/StringArrayArrayAc.ref.hpp

@@ -10,7 +10,6 @@
 #include "Fw/Types/BasicTypes.hpp"
 #include "Fw/Types/Serializable.hpp"
 #include "Fw/Types/String.hpp"
-
 #include "String2ArrayAc.hpp"
 
 //! An array of arrays of strings

compiler/tools/fpp-to-cpp/test/array/Struct1ArrayAc.ref.hpp

@@ -10,7 +10,6 @@
 #include "Fw/Types/BasicTypes.hpp"
 #include "Fw/Types/Serializable.hpp"
 #include "Fw/Types/String.hpp"
-
 #include "S1SerializableAc.hpp"
 
 //! An array of structs

compiler/tools/fpp-to-cpp/test/array/Struct2ArrayAc.ref.hpp

@@ -10,7 +10,6 @@
 #include "Fw/Types/BasicTypes.hpp"
 #include "Fw/Types/Serializable.hpp"
 #include "Fw/Types/String.hpp"
-
 #include "S2SerializableAc.hpp"
 
 //! Array of structs with struct member

compiler/tools/fpp-to-cpp/test/array/Struct3ArrayAc.ref.hpp

@@ -10,7 +10,6 @@
 #include "Fw/Types/BasicTypes.hpp"
 #include "Fw/Types/Serializable.hpp"
 #include "Fw/Types/String.hpp"
-
 #include "S3SerializableAc.hpp"
 
 //! An array of structs with array member