nasa/fpp
1
0
Fork 0
mirror of https://github.com/nasa/fpp.git synced 2025-12-11 19:23:13 -06:00
Code Issues Packages Projects Releases 83 Wiki Activity

Revise C++ code gen

Browse Source 
Remove unused header includes
This commit is contained in:
Rob Bocchino 2024-05-01 10:06:16 -07:00
parent b8f6d9f8a5
commit f706e977bb
46 changed files with 1 additions and 129 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
compiler/lib/src/main/scala/codegen/CppWriter/ArrayCppWriter.scala
View File

@ -98,22 +98,11 @@ case class ArrayCppWriter (
}
private def getCppIncludes: CppDoc.Member = {
val systemHeaders = List(
"cstdio",
"cstring",
).map(CppWriter.systemHeaderString).map(line)
val userHeaders = List(
"Fw/Types/Assert.hpp",
"Fw/Types/StringUtils.hpp",
s"${s.getRelativePath(fileName).toString}.hpp"
).sorted.map(CppWriter.headerString).map(line)
linesMember(
List(
Line.blank :: systemHeaders,
Line.blank :: userHeaders
).flatten,
CppDoc.Lines.Cpp
)
linesMember(Line.blank :: userHeaders, CppDoc.Lines.Cpp)
}
private def getClassMembers: List[CppDoc.Class.Member] =

1
compiler/lib/src/main/scala/codegen/CppWriter/StructCppWriter.scala
View File

@ -114,7 +114,6 @@ case class StructCppWriter(
private def getCppIncludes: CppDoc.Member = {
val userHeaders = List(
"Fw/Types/Assert.hpp",
"Fw/Types/StringUtils.hpp",
s"${s.getRelativePath(fileName).toString}.hpp",
).sorted.map(CppWriter.headerString).map(line)
linesMember(Line.blank :: userHeaders, CppDoc.Lines.Cpp)

4
compiler/tools/fpp-to-cpp/test/array/AArrayAc.ref.cpp
View File

@ -4,12 +4,8 @@
// \brief cpp file for A array
// ======================================================================
#include <cstdio>
#include <cstring>
#include "AArrayAc.hpp"
#include "Fw/Types/Assert.hpp"
#include "Fw/Types/StringUtils.hpp"
// ----------------------------------------------------------------------
// Constructors

4
compiler/tools/fpp-to-cpp/test/array/AbsTypeArrayAc.ref.cpp
View File

@ -4,12 +4,8 @@
// \brief cpp file for AbsType array
// ======================================================================
#include <cstdio>
#include <cstring>
#include "AbsTypeArrayAc.hpp"
#include "Fw/Types/Assert.hpp"
#include "Fw/Types/StringUtils.hpp"
// ----------------------------------------------------------------------
// Constructors

4
compiler/tools/fpp-to-cpp/test/array/BuiltInTypeArrayAc.ref.cpp
View File

@ -4,12 +4,8 @@
// \brief cpp file for BuiltInType array
// ======================================================================
#include <cstdio>
#include <cstring>
#include "BuiltInTypeArrayAc.hpp"
#include "Fw/Types/Assert.hpp"
#include "Fw/Types/StringUtils.hpp"
// ----------------------------------------------------------------------
// Constructors

4
compiler/tools/fpp-to-cpp/test/array/C_AArrayAc.ref.cpp
View File

@ -4,12 +4,8 @@
// \brief cpp file for C_A array
// ======================================================================
#include <cstdio>
#include <cstring>
#include "C_AArrayAc.hpp"
#include "Fw/Types/Assert.hpp"
#include "Fw/Types/StringUtils.hpp"
// ----------------------------------------------------------------------
// Constructors

4
compiler/tools/fpp-to-cpp/test/array/Enum1ArrayAc.ref.cpp
View File

@ -4,12 +4,8 @@
// \brief cpp file for Enum1 array
// ======================================================================
#include <cstdio>
#include <cstring>
#include "Enum1ArrayAc.hpp"
#include "Fw/Types/Assert.hpp"
#include "Fw/Types/StringUtils.hpp"
// ----------------------------------------------------------------------
// Constructors

4
compiler/tools/fpp-to-cpp/test/array/Enum2ArrayAc.ref.cpp
View File

@ -4,12 +4,8 @@
// \brief cpp file for Enum2 array
// ======================================================================
#include <cstdio>
#include <cstring>
#include "Enum2ArrayAc.hpp"
#include "Fw/Types/Assert.hpp"
#include "Fw/Types/StringUtils.hpp"
// ----------------------------------------------------------------------
// Constructors

4
compiler/tools/fpp-to-cpp/test/array/HeaderPathArrayAc.ref.cpp
View File

@ -4,11 +4,7 @@
// \brief cpp file for HeaderPath array
// ======================================================================
#include <cstdio>
#include <cstring>
#include "Fw/Types/Assert.hpp"
#include "Fw/Types/StringUtils.hpp"
#include "HeaderPathArrayAc.hpp"
// ----------------------------------------------------------------------

4
compiler/tools/fpp-to-cpp/test/array/PrimitiveArrayArrayAc.ref.cpp
View File

@ -4,11 +4,7 @@
// \brief cpp file for PrimitiveArray array
// ======================================================================
#include <cstdio>
#include <cstring>
#include "Fw/Types/Assert.hpp"
#include "Fw/Types/StringUtils.hpp"
#include "PrimitiveArrayArrayAc.hpp"
// ----------------------------------------------------------------------

4
compiler/tools/fpp-to-cpp/test/array/PrimitiveBoolArrayAc.ref.cpp
View File

@ -4,11 +4,7 @@
// \brief cpp file for PrimitiveBool array
// ======================================================================
#include <cstdio>
#include <cstring>
#include "Fw/Types/Assert.hpp"
#include "Fw/Types/StringUtils.hpp"
#include "PrimitiveBoolArrayAc.hpp"
namespace M {

4
compiler/tools/fpp-to-cpp/test/array/PrimitiveF32eArrayAc.ref.cpp
View File

@ -4,11 +4,7 @@
// \brief cpp file for PrimitiveF32e array
// ======================================================================
#include <cstdio>
#include <cstring>
#include "Fw/Types/Assert.hpp"
#include "Fw/Types/StringUtils.hpp"
#include "PrimitiveF32eArrayAc.hpp"
namespace M {

4
compiler/tools/fpp-to-cpp/test/array/PrimitiveF32fArrayAc.ref.cpp
View File

@ -4,11 +4,7 @@
// \brief cpp file for PrimitiveF32f array
// ======================================================================
#include <cstdio>
#include <cstring>
#include "Fw/Types/Assert.hpp"
#include "Fw/Types/StringUtils.hpp"
#include "PrimitiveF32fArrayAc.hpp"
namespace M {

4
compiler/tools/fpp-to-cpp/test/array/PrimitiveF64ArrayAc.ref.cpp
View File

@ -4,11 +4,7 @@
// \brief cpp file for PrimitiveF64 array
// ======================================================================
#include <cstdio>
#include <cstring>
#include "Fw/Types/Assert.hpp"
#include "Fw/Types/StringUtils.hpp"
#include "PrimitiveF64ArrayAc.hpp"
namespace M {

4
compiler/tools/fpp-to-cpp/test/array/PrimitiveI32ArrayAc.ref.cpp
View File

@ -4,11 +4,7 @@
// \brief cpp file for PrimitiveI32 array
// ======================================================================
#include <cstdio>
#include <cstring>
#include "Fw/Types/Assert.hpp"
#include "Fw/Types/StringUtils.hpp"
#include "PrimitiveI32ArrayAc.hpp"
namespace M {

4
compiler/tools/fpp-to-cpp/test/array/PrimitiveI64ArrayAc.ref.cpp
View File

@ -4,11 +4,7 @@
// \brief cpp file for PrimitiveI64 array
// ======================================================================
#include <cstdio>
#include <cstring>
#include "Fw/Types/Assert.hpp"
#include "Fw/Types/StringUtils.hpp"
#include "PrimitiveI64ArrayAc.hpp"
namespace M {

4
compiler/tools/fpp-to-cpp/test/array/PrimitiveU16ArrayAc.ref.cpp
View File

@ -4,11 +4,7 @@
// \brief cpp file for PrimitiveU16 array
// ======================================================================
#include <cstdio>
#include <cstring>
#include "Fw/Types/Assert.hpp"
#include "Fw/Types/StringUtils.hpp"
#include "PrimitiveU16ArrayAc.hpp"
namespace M {

4
compiler/tools/fpp-to-cpp/test/array/PrimitiveU8ArrayAc.ref.cpp
View File

@ -4,11 +4,7 @@
// \brief cpp file for PrimitiveU8 array
// ======================================================================
#include <cstdio>
#include <cstring>
#include "Fw/Types/Assert.hpp"
#include "Fw/Types/StringUtils.hpp"
#include "PrimitiveU8ArrayAc.hpp"
namespace M {

1
compiler/tools/fpp-to-cpp/test/array/S1SerializableAc.ref.cpp
View File

@ -5,7 +5,6 @@
// ======================================================================
#include "Fw/Types/Assert.hpp"
#include "Fw/Types/StringUtils.hpp"
#include "S1SerializableAc.hpp"
namespace M {

1
compiler/tools/fpp-to-cpp/test/array/S2SerializableAc.ref.cpp
View File

@ -5,7 +5,6 @@
// ======================================================================
#include "Fw/Types/Assert.hpp"
#include "Fw/Types/StringUtils.hpp"
#include "S2SerializableAc.hpp"
// ----------------------------------------------------------------------

1
compiler/tools/fpp-to-cpp/test/array/S3SerializableAc.ref.cpp
View File

@ -5,7 +5,6 @@
// ======================================================================
#include "Fw/Types/Assert.hpp"
#include "Fw/Types/StringUtils.hpp"
#include "S3SerializableAc.hpp"
namespace S {

4
compiler/tools/fpp-to-cpp/test/array/SingleElementArrayAc.ref.cpp
View File

@ -4,11 +4,7 @@
// \brief cpp file for SingleElement array
// ======================================================================
#include <cstdio>
#include <cstring>
#include "Fw/Types/Assert.hpp"
#include "Fw/Types/StringUtils.hpp"
#include "SingleElementArrayAc.hpp"
// ----------------------------------------------------------------------

4
compiler/tools/fpp-to-cpp/test/array/String1ArrayAc.ref.cpp
View File

@ -4,11 +4,7 @@
// \brief cpp file for String1 array
// ======================================================================
#include <cstdio>
#include <cstring>
#include "Fw/Types/Assert.hpp"
#include "Fw/Types/StringUtils.hpp"
#include "String1ArrayAc.hpp"
// ----------------------------------------------------------------------

4
compiler/tools/fpp-to-cpp/test/array/String2ArrayAc.ref.cpp
View File

@ -4,11 +4,7 @@
// \brief cpp file for String2 array
// ======================================================================
#include <cstdio>
#include <cstring>
#include "Fw/Types/Assert.hpp"
#include "Fw/Types/StringUtils.hpp"
#include "String2ArrayAc.hpp"
// ----------------------------------------------------------------------

4
compiler/tools/fpp-to-cpp/test/array/StringArrayArrayAc.ref.cpp
View File

@ -4,11 +4,7 @@
// \brief cpp file for StringArray array
// ======================================================================
#include <cstdio>
#include <cstring>
#include "Fw/Types/Assert.hpp"
#include "Fw/Types/StringUtils.hpp"
#include "StringArrayArrayAc.hpp"
// ----------------------------------------------------------------------

4
compiler/tools/fpp-to-cpp/test/array/Struct1ArrayAc.ref.cpp
View File

@ -4,11 +4,7 @@
// \brief cpp file for Struct1 array
// ======================================================================
#include <cstdio>
#include <cstring>
#include "Fw/Types/Assert.hpp"
#include "Fw/Types/StringUtils.hpp"
#include "Struct1ArrayAc.hpp"
// ----------------------------------------------------------------------

4
compiler/tools/fpp-to-cpp/test/array/Struct2ArrayAc.ref.cpp
View File

@ -4,11 +4,7 @@
// \brief cpp file for Struct2 array
// ======================================================================
#include <cstdio>
#include <cstring>
#include "Fw/Types/Assert.hpp"
#include "Fw/Types/StringUtils.hpp"
#include "Struct2ArrayAc.hpp"
// ----------------------------------------------------------------------

4
compiler/tools/fpp-to-cpp/test/array/Struct3ArrayAc.ref.cpp
View File

@ -4,11 +4,7 @@
// \brief cpp file for Struct3 array
// ======================================================================
#include <cstdio>
#include <cstring>
#include "Fw/Types/Assert.hpp"
#include "Fw/Types/StringUtils.hpp"
#include "Struct3ArrayAc.hpp"
// ----------------------------------------------------------------------

4
compiler/tools/fpp-to-cpp/test/component/base/AArrayAc.ref.cpp
View File

@ -4,11 +4,7 @@
// \brief cpp file for A array
// ======================================================================
#include <cstdio>
#include <cstring>
#include "Fw/Types/Assert.hpp"
#include "Fw/Types/StringUtils.hpp"
#include "base/AArrayAc.hpp"
// ----------------------------------------------------------------------

1
compiler/tools/fpp-to-cpp/test/component/base/SSerializableAc.ref.cpp
View File

@ -5,7 +5,6 @@
// ======================================================================
#include "Fw/Types/Assert.hpp"
#include "Fw/Types/StringUtils.hpp"
#include "base/SSerializableAc.hpp"
// ----------------------------------------------------------------------

1
compiler/tools/fpp-to-cpp/test/struct/AbsTypeSerializableAc.ref.cpp
View File

@ -6,7 +6,6 @@
#include "AbsTypeSerializableAc.hpp"
#include "Fw/Types/Assert.hpp"
#include "Fw/Types/StringUtils.hpp"
// ----------------------------------------------------------------------
// Constructors

1
compiler/tools/fpp-to-cpp/test/struct/C_SSerializableAc.ref.cpp
View File

@ -6,7 +6,6 @@
#include "C_SSerializableAc.hpp"
#include "Fw/Types/Assert.hpp"
#include "Fw/Types/StringUtils.hpp"
// ----------------------------------------------------------------------
// Constructors

1
compiler/tools/fpp-to-cpp/test/struct/DefaultSerializableAc.ref.cpp
View File

@ -6,7 +6,6 @@
#include "DefaultSerializableAc.hpp"
#include "Fw/Types/Assert.hpp"
#include "Fw/Types/StringUtils.hpp"
// ----------------------------------------------------------------------
// Constructors

1
compiler/tools/fpp-to-cpp/test/struct/EnumSerializableAc.ref.cpp
View File

@ -6,7 +6,6 @@
#include "EnumSerializableAc.hpp"
#include "Fw/Types/Assert.hpp"
#include "Fw/Types/StringUtils.hpp"
// ----------------------------------------------------------------------
// Constructors

1
compiler/tools/fpp-to-cpp/test/struct/FormatSerializableAc.ref.cpp
View File

@ -6,7 +6,6 @@
#include "FormatSerializableAc.hpp"
#include "Fw/Types/Assert.hpp"
#include "Fw/Types/StringUtils.hpp"
// ----------------------------------------------------------------------
// Constructors

1
compiler/tools/fpp-to-cpp/test/struct/IncludedSerializableAc.ref.cpp
View File

@ -5,7 +5,6 @@
// ======================================================================
#include "Fw/Types/Assert.hpp"
#include "Fw/Types/StringUtils.hpp"
#include "IncludedSerializableAc.hpp"
// ----------------------------------------------------------------------

1
compiler/tools/fpp-to-cpp/test/struct/IncludingSerializableAc.ref.cpp
View File

@ -5,7 +5,6 @@
// ======================================================================
#include "Fw/Types/Assert.hpp"
#include "Fw/Types/StringUtils.hpp"
#include "IncludingSerializableAc.hpp"
// ----------------------------------------------------------------------

1
compiler/tools/fpp-to-cpp/test/struct/Modules1SerializableAc.ref.cpp
View File

@ -5,7 +5,6 @@
// ======================================================================
#include "Fw/Types/Assert.hpp"
#include "Fw/Types/StringUtils.hpp"
#include "Modules1SerializableAc.hpp"
namespace M {

1
compiler/tools/fpp-to-cpp/test/struct/Modules2SerializableAc.ref.cpp
View File

@ -5,7 +5,6 @@
// ======================================================================
#include "Fw/Types/Assert.hpp"
#include "Fw/Types/StringUtils.hpp"
#include "Modules2SerializableAc.hpp"
namespace M {

1
compiler/tools/fpp-to-cpp/test/struct/Modules3SerializableAc.ref.cpp
View File

@ -5,7 +5,6 @@
// ======================================================================
#include "Fw/Types/Assert.hpp"
#include "Fw/Types/StringUtils.hpp"
#include "Modules3SerializableAc.hpp"
// ----------------------------------------------------------------------

1
compiler/tools/fpp-to-cpp/test/struct/Modules4SerializableAc.ref.cpp
View File

@ -5,7 +5,6 @@
// ======================================================================
#include "Fw/Types/Assert.hpp"
#include "Fw/Types/StringUtils.hpp"
#include "Modules4SerializableAc.hpp"
// ----------------------------------------------------------------------

1
compiler/tools/fpp-to-cpp/test/struct/PrimitiveSerializableAc.ref.cpp
View File

@ -5,7 +5,6 @@
// ======================================================================
#include "Fw/Types/Assert.hpp"
#include "Fw/Types/StringUtils.hpp"
#include "PrimitiveSerializableAc.hpp"
// ----------------------------------------------------------------------

1
compiler/tools/fpp-to-cpp/test/struct/PrimitiveStructSerializableAc.ref.cpp
View File

@ -5,7 +5,6 @@
// ======================================================================
#include "Fw/Types/Assert.hpp"
#include "Fw/Types/StringUtils.hpp"
#include "PrimitiveStructSerializableAc.hpp"
// ----------------------------------------------------------------------

1
compiler/tools/fpp-to-cpp/test/struct/SSerializableAc.ref.cpp
View File

@ -5,7 +5,6 @@
// ======================================================================
#include "Fw/Types/Assert.hpp"
#include "Fw/Types/StringUtils.hpp"
#include "SSerializableAc.hpp"
// ----------------------------------------------------------------------

1
compiler/tools/fpp-to-cpp/test/struct/StringArraySerializableAc.ref.cpp
View File

@ -5,7 +5,6 @@
// ======================================================================
#include "Fw/Types/Assert.hpp"
#include "Fw/Types/StringUtils.hpp"
#include "StringArraySerializableAc.hpp"
// ----------------------------------------------------------------------

1
compiler/tools/fpp-to-cpp/test/struct/StringSerializableAc.ref.cpp
View File

@ -5,7 +5,6 @@
// ======================================================================
#include "Fw/Types/Assert.hpp"
#include "Fw/Types/StringUtils.hpp"
#include "StringSerializableAc.hpp"
// ----------------------------------------------------------------------