Merge pull request #447 from jwest115/issue-375

Remove FW_ARRAY_TO_STRING #375
nasa · Jun 20, 2024 · 718c5ec · 718c5ec
2 parents adee0c8 + ab9e38e
commit 718c5ec
Show file tree

Hide file tree

Showing 85 changed files with 93 additions and 2,591 deletions.
diff --git a/compiler/lib/src/main/scala/codegen/CppWriter/ArrayCppWriter.scala b/compiler/lib/src/main/scala/codegen/CppWriter/ArrayCppWriter.scala
@@ -477,7 +477,7 @@ case class ArrayCppWriter (
     )
     ) ++
       wrapClassMembersInIfDirective(
-        "\n#if FW_ARRAY_TO_STRING",
+        "\n#if FW_SERIALIZABLE_TO_STRING",
         List(
           functionClassMember(
             Some("Convert array to string"),

diff --git a/compiler/lib/src/main/scala/codegen/CppWriter/EnumCppWriter.scala b/compiler/lib/src/main/scala/codegen/CppWriter/EnumCppWriter.scala
@@ -360,7 +360,7 @@ case class EnumCppWriter(
           )
         ),
         wrapClassMembersInIfDirective(
-          "\n#if FW_SERIALIZABLE_TO_STRING || FW_ENABLE_TEXT_LOGGING",
+          "\n#if FW_SERIALIZABLE_TO_STRING",
           List(
             functionClassMember(
               Some(s"Convert enum to string"),

diff --git a/compiler/tools/fpp-to-cpp/test/array/AArrayAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/array/AArrayAc.ref.cpp
@@ -170,7 +170,7 @@ Fw::SerializeStatus A ::
   return status;
 }
 
-#if FW_ARRAY_TO_STRING
+#if FW_SERIALIZABLE_TO_STRING
 
 void A ::
   toString(Fw::StringBase& sb) const

diff --git a/compiler/tools/fpp-to-cpp/test/array/AArrayAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/array/AArrayAc.ref.hpp
@@ -139,7 +139,7 @@ class A :
         Fw::SerializeBufferBase& buffer //!< The serial buffer
     );
 
-#if FW_ARRAY_TO_STRING
+#if FW_SERIALIZABLE_TO_STRING
 
     //! Convert array to string
     void toString(

diff --git a/compiler/tools/fpp-to-cpp/test/array/AbsTypeArrayAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/array/AbsTypeArrayAc.ref.cpp
@@ -170,7 +170,7 @@ Fw::SerializeStatus AbsType ::
   return status;
 }
 
-#if FW_ARRAY_TO_STRING
+#if FW_SERIALIZABLE_TO_STRING
 
 void AbsType ::
   toString(Fw::StringBase& sb) const

diff --git a/compiler/tools/fpp-to-cpp/test/array/AbsTypeArrayAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/array/AbsTypeArrayAc.ref.hpp
@@ -140,7 +140,7 @@ class AbsType :
         Fw::SerializeBufferBase& buffer //!< The serial buffer
     );
 
-#if FW_ARRAY_TO_STRING
+#if FW_SERIALIZABLE_TO_STRING
 
     //! Convert array to string
     void toString(

diff --git a/compiler/tools/fpp-to-cpp/test/array/BuiltInTypeArrayAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/array/BuiltInTypeArrayAc.ref.cpp
@@ -170,7 +170,7 @@ Fw::SerializeStatus BuiltInType ::
   return status;
 }
 
-#if FW_ARRAY_TO_STRING
+#if FW_SERIALIZABLE_TO_STRING
 
 void BuiltInType ::
   toString(Fw::StringBase& sb) const

diff --git a/compiler/tools/fpp-to-cpp/test/array/BuiltInTypeArrayAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/array/BuiltInTypeArrayAc.ref.hpp
@@ -139,7 +139,7 @@ class BuiltInType :
         Fw::SerializeBufferBase& buffer //!< The serial buffer
     );
 
-#if FW_ARRAY_TO_STRING
+#if FW_SERIALIZABLE_TO_STRING
 
     //! Convert array to string
     void toString(

diff --git a/compiler/tools/fpp-to-cpp/test/array/C_AArrayAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/array/C_AArrayAc.ref.cpp
@@ -170,7 +170,7 @@ Fw::SerializeStatus C_A ::
   return status;
 }
 
-#if FW_ARRAY_TO_STRING
+#if FW_SERIALIZABLE_TO_STRING
 
 void C_A ::
   toString(Fw::StringBase& sb) const

diff --git a/compiler/tools/fpp-to-cpp/test/array/C_AArrayAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/array/C_AArrayAc.ref.hpp
@@ -138,7 +138,7 @@ class C_A :
         Fw::SerializeBufferBase& buffer //!< The serial buffer
     );
 
-#if FW_ARRAY_TO_STRING
+#if FW_SERIALIZABLE_TO_STRING
 
     //! Convert array to string
     void toString(

diff --git a/compiler/tools/fpp-to-cpp/test/array/E1EnumAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/array/E1EnumAc.ref.hpp
@@ -141,7 +141,7 @@ namespace M {
           Fw::SerializeBufferBase& buffer //!< The serial buffer
       );
 
-#if FW_SERIALIZABLE_TO_STRING || FW_ENABLE_TEXT_LOGGING
+#if FW_SERIALIZABLE_TO_STRING
 
       //! Convert enum to string
       void toString(

diff --git a/compiler/tools/fpp-to-cpp/test/array/E2EnumAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/array/E2EnumAc.ref.hpp
@@ -140,7 +140,7 @@ class E2 :
         Fw::SerializeBufferBase& buffer //!< The serial buffer
     );
 
-#if FW_SERIALIZABLE_TO_STRING || FW_ENABLE_TEXT_LOGGING
+#if FW_SERIALIZABLE_TO_STRING
 
     //! Convert enum to string
     void toString(

diff --git a/compiler/tools/fpp-to-cpp/test/array/Enum1ArrayAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/array/Enum1ArrayAc.ref.cpp
@@ -167,7 +167,7 @@ Fw::SerializeStatus Enum1 ::
   return status;
 }
 
-#if FW_ARRAY_TO_STRING
+#if FW_SERIALIZABLE_TO_STRING
 
 void Enum1 ::
   toString(Fw::StringBase& sb) const

diff --git a/compiler/tools/fpp-to-cpp/test/array/Enum1ArrayAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/array/Enum1ArrayAc.ref.hpp
@@ -139,7 +139,7 @@ class Enum1 :
         Fw::SerializeBufferBase& buffer //!< The serial buffer
     );
 
-#if FW_ARRAY_TO_STRING
+#if FW_SERIALIZABLE_TO_STRING
 
     //! Convert array to string
     void toString(

diff --git a/compiler/tools/fpp-to-cpp/test/array/Enum2ArrayAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/array/Enum2ArrayAc.ref.cpp
@@ -176,7 +176,7 @@ Fw::SerializeStatus Enum2 ::
   return status;
 }
 
-#if FW_ARRAY_TO_STRING
+#if FW_SERIALIZABLE_TO_STRING
 
 void Enum2 ::
   toString(Fw::StringBase& sb) const

diff --git a/compiler/tools/fpp-to-cpp/test/array/Enum2ArrayAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/array/Enum2ArrayAc.ref.hpp
@@ -141,7 +141,7 @@ class Enum2 :
         Fw::SerializeBufferBase& buffer //!< The serial buffer
     );
 
-#if FW_ARRAY_TO_STRING
+#if FW_SERIALIZABLE_TO_STRING
 
     //! Convert array to string
     void toString(

diff --git a/compiler/tools/fpp-to-cpp/test/array/HeaderPathArrayAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/array/HeaderPathArrayAc.ref.cpp
@@ -170,7 +170,7 @@ Fw::SerializeStatus HeaderPath ::
   return status;
 }
 
-#if FW_ARRAY_TO_STRING
+#if FW_SERIALIZABLE_TO_STRING
 
 void HeaderPath ::
   toString(Fw::StringBase& sb) const

diff --git a/compiler/tools/fpp-to-cpp/test/array/HeaderPathArrayAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/array/HeaderPathArrayAc.ref.hpp
@@ -140,7 +140,7 @@ class HeaderPath :
         Fw::SerializeBufferBase& buffer //!< The serial buffer
     );
 
-#if FW_ARRAY_TO_STRING
+#if FW_SERIALIZABLE_TO_STRING
 
     //! Convert array to string
     void toString(

diff --git a/compiler/tools/fpp-to-cpp/test/array/PrimitiveArrayArrayAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/array/PrimitiveArrayArrayAc.ref.cpp
@@ -176,7 +176,7 @@ Fw::SerializeStatus PrimitiveArray ::
   return status;
 }
 
-#if FW_ARRAY_TO_STRING
+#if FW_SERIALIZABLE_TO_STRING
 
 void PrimitiveArray ::
   toString(Fw::StringBase& sb) const

diff --git a/compiler/tools/fpp-to-cpp/test/array/PrimitiveArrayArrayAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/array/PrimitiveArrayArrayAc.ref.hpp
@@ -142,7 +142,7 @@ class PrimitiveArray :
         Fw::SerializeBufferBase& buffer //!< The serial buffer
     );
 
-#if FW_ARRAY_TO_STRING
+#if FW_SERIALIZABLE_TO_STRING
 
     //! Convert array to string
     void toString(

diff --git a/compiler/tools/fpp-to-cpp/test/array/PrimitiveBoolArrayAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/array/PrimitiveBoolArrayAc.ref.cpp
@@ -172,7 +172,7 @@ namespace M {
     return status;
   }
 
-#if FW_ARRAY_TO_STRING
+#if FW_SERIALIZABLE_TO_STRING
 
   void PrimitiveBool ::
     toString(Fw::StringBase& sb) const

diff --git a/compiler/tools/fpp-to-cpp/test/array/PrimitiveBoolArrayAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/array/PrimitiveBoolArrayAc.ref.hpp
@@ -140,7 +140,7 @@ namespace M {
           Fw::SerializeBufferBase& buffer //!< The serial buffer
       );
 
-#if FW_ARRAY_TO_STRING
+#if FW_SERIALIZABLE_TO_STRING
 
       //! Convert array to string
       void toString(

diff --git a/compiler/tools/fpp-to-cpp/test/array/PrimitiveF32eArrayAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/array/PrimitiveF32eArrayAc.ref.cpp
@@ -172,7 +172,7 @@ namespace M {
     return status;
   }
 
-#if FW_ARRAY_TO_STRING
+#if FW_SERIALIZABLE_TO_STRING
 
   void PrimitiveF32e ::
     toString(Fw::StringBase& sb) const

diff --git a/compiler/tools/fpp-to-cpp/test/array/PrimitiveF32eArrayAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/array/PrimitiveF32eArrayAc.ref.hpp
@@ -141,7 +141,7 @@ namespace M {
           Fw::SerializeBufferBase& buffer //!< The serial buffer
       );
 
-#if FW_ARRAY_TO_STRING
+#if FW_SERIALIZABLE_TO_STRING
 
       //! Convert array to string
       void toString(

diff --git a/compiler/tools/fpp-to-cpp/test/array/PrimitiveF32fArrayAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/array/PrimitiveF32fArrayAc.ref.cpp
@@ -172,7 +172,7 @@ namespace M {
     return status;
   }
 
-#if FW_ARRAY_TO_STRING
+#if FW_SERIALIZABLE_TO_STRING
 
   void PrimitiveF32f ::
     toString(Fw::StringBase& sb) const

diff --git a/compiler/tools/fpp-to-cpp/test/array/PrimitiveF32fArrayAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/array/PrimitiveF32fArrayAc.ref.hpp
@@ -141,7 +141,7 @@ namespace M {
           Fw::SerializeBufferBase& buffer //!< The serial buffer
       );
 
-#if FW_ARRAY_TO_STRING
+#if FW_SERIALIZABLE_TO_STRING
 
       //! Convert array to string
       void toString(

diff --git a/compiler/tools/fpp-to-cpp/test/array/PrimitiveF64ArrayAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/array/PrimitiveF64ArrayAc.ref.cpp
@@ -178,7 +178,7 @@ namespace M {
     return status;
   }
 
-#if FW_ARRAY_TO_STRING
+#if FW_SERIALIZABLE_TO_STRING
 
   void PrimitiveF64 ::
     toString(Fw::StringBase& sb) const

diff --git a/compiler/tools/fpp-to-cpp/test/array/PrimitiveF64ArrayAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/array/PrimitiveF64ArrayAc.ref.hpp
@@ -143,7 +143,7 @@ namespace M {
           Fw::SerializeBufferBase& buffer //!< The serial buffer
       );
 
-#if FW_ARRAY_TO_STRING
+#if FW_SERIALIZABLE_TO_STRING
 
       //! Convert array to string
       void toString(

diff --git a/compiler/tools/fpp-to-cpp/test/array/PrimitiveI32ArrayAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/array/PrimitiveI32ArrayAc.ref.cpp
@@ -172,7 +172,7 @@ namespace M {
     return status;
   }
 
-#if FW_ARRAY_TO_STRING
+#if FW_SERIALIZABLE_TO_STRING
 
   void PrimitiveI32 ::
     toString(Fw::StringBase& sb) const

diff --git a/compiler/tools/fpp-to-cpp/test/array/PrimitiveI32ArrayAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/array/PrimitiveI32ArrayAc.ref.hpp
@@ -141,7 +141,7 @@ namespace M {
           Fw::SerializeBufferBase& buffer //!< The serial buffer
       );
 
-#if FW_ARRAY_TO_STRING
+#if FW_SERIALIZABLE_TO_STRING
 
       //! Convert array to string
       void toString(

diff --git a/compiler/tools/fpp-to-cpp/test/array/PrimitiveI64ArrayAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/array/PrimitiveI64ArrayAc.ref.cpp
@@ -172,7 +172,7 @@ namespace M {
     return status;
   }
 
-#if FW_ARRAY_TO_STRING
+#if FW_SERIALIZABLE_TO_STRING
 
   void PrimitiveI64 ::
     toString(Fw::StringBase& sb) const

diff --git a/compiler/tools/fpp-to-cpp/test/array/PrimitiveI64ArrayAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/array/PrimitiveI64ArrayAc.ref.hpp
@@ -141,7 +141,7 @@ namespace M {
           Fw::SerializeBufferBase& buffer //!< The serial buffer
       );
 
-#if FW_ARRAY_TO_STRING
+#if FW_SERIALIZABLE_TO_STRING
 
       //! Convert array to string
       void toString(

diff --git a/compiler/tools/fpp-to-cpp/test/array/PrimitiveU16ArrayAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/array/PrimitiveU16ArrayAc.ref.cpp
@@ -172,7 +172,7 @@ namespace M {
     return status;
   }
 
-#if FW_ARRAY_TO_STRING
+#if FW_SERIALIZABLE_TO_STRING
 
   void PrimitiveU16 ::
     toString(Fw::StringBase& sb) const

diff --git a/compiler/tools/fpp-to-cpp/test/array/PrimitiveU16ArrayAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/array/PrimitiveU16ArrayAc.ref.hpp
@@ -140,7 +140,7 @@ namespace M {
           Fw::SerializeBufferBase& buffer //!< The serial buffer
       );
 
-#if FW_ARRAY_TO_STRING
+#if FW_SERIALIZABLE_TO_STRING
 
       //! Convert array to string
       void toString(

diff --git a/compiler/tools/fpp-to-cpp/test/array/PrimitiveU8ArrayAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/array/PrimitiveU8ArrayAc.ref.cpp
@@ -172,7 +172,7 @@ namespace M {
     return status;
   }
 
-#if FW_ARRAY_TO_STRING
+#if FW_SERIALIZABLE_TO_STRING
 
   void PrimitiveU8 ::
     toString(Fw::StringBase& sb) const

diff --git a/compiler/tools/fpp-to-cpp/test/array/PrimitiveU8ArrayAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/array/PrimitiveU8ArrayAc.ref.hpp
@@ -140,7 +140,7 @@ namespace M {
           Fw::SerializeBufferBase& buffer //!< The serial buffer
       );
 
-#if FW_ARRAY_TO_STRING
+#if FW_SERIALIZABLE_TO_STRING
 
       //! Convert array to string
       void toString(

diff --git a/compiler/tools/fpp-to-cpp/test/array/SingleElementArrayAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/array/SingleElementArrayAc.ref.cpp
@@ -153,7 +153,7 @@ Fw::SerializeStatus SingleElement ::
   return status;
 }
 
-#if FW_ARRAY_TO_STRING
+#if FW_SERIALIZABLE_TO_STRING
 
 void SingleElement ::
   toString(Fw::StringBase& sb) const

diff --git a/compiler/tools/fpp-to-cpp/test/array/SingleElementArrayAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/array/SingleElementArrayAc.ref.hpp
@@ -132,7 +132,7 @@ class SingleElement :
         Fw::SerializeBufferBase& buffer //!< The serial buffer
     );
 
-#if FW_ARRAY_TO_STRING
+#if FW_SERIALIZABLE_TO_STRING
 
     //! Convert array to string
     void toString(

diff --git a/compiler/tools/fpp-to-cpp/test/array/String1ArrayAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/array/String1ArrayAc.ref.cpp
@@ -175,7 +175,7 @@ Fw::SerializeStatus String1 ::
   return status;
 }
 
-#if FW_ARRAY_TO_STRING
+#if FW_SERIALIZABLE_TO_STRING
 
 void String1 ::
   toString(Fw::StringBase& sb) const

diff --git a/compiler/tools/fpp-to-cpp/test/array/String1ArrayAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/array/String1ArrayAc.ref.hpp
@@ -143,7 +143,7 @@ class String1 :
         Fw::SerializeBufferBase& buffer //!< The serial buffer
     );
 
-#if FW_ARRAY_TO_STRING
+#if FW_SERIALIZABLE_TO_STRING
 
     //! Convert array to string
     void toString(

diff --git a/compiler/tools/fpp-to-cpp/test/array/String2ArrayAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/array/String2ArrayAc.ref.cpp
@@ -172,7 +172,7 @@ Fw::SerializeStatus String2 ::
   return status;
 }
 
-#if FW_ARRAY_TO_STRING
+#if FW_SERIALIZABLE_TO_STRING
 
 void String2 ::
   toString(Fw::StringBase& sb) const

diff --git a/compiler/tools/fpp-to-cpp/test/array/String2ArrayAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/array/String2ArrayAc.ref.hpp
@@ -142,7 +142,7 @@ class String2 :
         Fw::SerializeBufferBase& buffer //!< The serial buffer
     );
 
-#if FW_ARRAY_TO_STRING
+#if FW_SERIALIZABLE_TO_STRING
 
     //! Convert array to string
     void toString(

diff --git a/compiler/tools/fpp-to-cpp/test/array/StringArrayArrayAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/array/StringArrayArrayAc.ref.cpp
@@ -176,7 +176,7 @@ Fw::SerializeStatus StringArray ::
   return status;
 }
 
-#if FW_ARRAY_TO_STRING
+#if FW_SERIALIZABLE_TO_STRING
 
 void StringArray ::
   toString(Fw::StringBase& sb) const

diff --git a/compiler/tools/fpp-to-cpp/test/array/StringArrayArrayAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/array/StringArrayArrayAc.ref.hpp
@@ -142,7 +142,7 @@ class StringArray :
         Fw::SerializeBufferBase& buffer //!< The serial buffer
     );
 
-#if FW_ARRAY_TO_STRING
+#if FW_SERIALIZABLE_TO_STRING
 
     //! Convert array to string
     void toString(