diff --git a/compiler/lib/src/main/resources/META-INF/native-image/reflect-config.json b/compiler/lib/src/main/resources/META-INF/native-image/reflect-config.json index 6a6c55e45..70e1d6c40 100644 --- a/compiler/lib/src/main/resources/META-INF/native-image/reflect-config.json +++ b/compiler/lib/src/main/resources/META-INF/native-image/reflect-config.json @@ -8,6 +8,9 @@ { "name":"[Lio.circe.Encoder;" }, +{ + "name":"[Ljava.io.File;" +}, { "name":"[Ljava.lang.String;" }, @@ -255,6 +258,26 @@ "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1314", "fields":[{"name":"0bitmap$1206"}] }, +{ + "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1315", + "fields":[{"name":"0bitmap$1205"}] +}, +{ + "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1316", + "fields":[{"name":"0bitmap$1201"}] +}, +{ + "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1317", + "fields":[{"name":"0bitmap$1202"}] +}, +{ + "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1318", + "fields":[{"name":"0bitmap$1203"}] +}, +{ + "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1319", + "fields":[{"name":"0bitmap$1204"}] +}, { "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1321", "fields":[{"name":"0bitmap$1211"}] @@ -1055,6 +1078,26 @@ "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1879", "fields":[{"name":"0bitmap$1729"}] }, +{ + "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1880", + "fields":[{"name":"0bitmap$1728"}] +}, +{ + "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1881", + "fields":[{"name":"0bitmap$1724"}] +}, +{ + "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1882", + "fields":[{"name":"0bitmap$1725"}] +}, +{ + "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1883", + "fields":[{"name":"0bitmap$1726"}] +}, +{ + "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1884", + "fields":[{"name":"0bitmap$1727"}] +}, { "name":"fpp.compiler.codegen.AnalysisJsonEncoder$$anon$1886", "fields":[{"name":"0bitmap$1734"}] @@ -3503,6 +3546,22 @@ "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$291", "fields":[{"name":"0bitmap$269"}] }, +{ + "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$292", + "fields":[{"name":"0bitmap$265"}] +}, +{ + "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$293", + "fields":[{"name":"0bitmap$266"}] +}, +{ + "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$294", + "fields":[{"name":"0bitmap$267"}] +}, +{ + "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$295", + "fields":[{"name":"0bitmap$268"}] +}, { "name":"fpp.compiler.codegen.AstJsonEncoder$$anon$296", "fields":[{"name":"0bitmap$294"}] diff --git a/compiler/lib/src/main/scala/codegen/CppWriter/ArrayCppWriter.scala b/compiler/lib/src/main/scala/codegen/CppWriter/ArrayCppWriter.scala index ec1ba35db..bff93a44e 100644 --- a/compiler/lib/src/main/scala/codegen/CppWriter/ArrayCppWriter.scala +++ b/compiler/lib/src/main/scala/codegen/CppWriter/ArrayCppWriter.scala @@ -179,7 +179,7 @@ case class ArrayCppWriter ( Nil, List( "Serializable()", - "elements{}" + "elements()" ), List.concat( initElementsCall, diff --git a/compiler/lib/src/main/scala/codegen/CppWriter/StructCppWriter.scala b/compiler/lib/src/main/scala/codegen/CppWriter/StructCppWriter.scala index 9a2aeeb52..367ea80b7 100644 --- a/compiler/lib/src/main/scala/codegen/CppWriter/StructCppWriter.scala +++ b/compiler/lib/src/main/scala/codegen/CppWriter/StructCppWriter.scala @@ -214,7 +214,7 @@ case class StructCppWriter( Some("Constructor (default value)"), Nil, "Serializable()" :: initializerListMemberNames.map(n => { - if defaultMemberNames.contains(n) then s"m_$n{}" + if defaultMemberNames.contains(n) then s"m_$n()" else defaultValueMembers(n) match { case v: Value.Struct => s"m_$n(${ValueCppWriter.writeStructMembers(s, v)})" case _: Value.AbsType => s"m_$n()" diff --git a/compiler/tools/fpp-to-cpp/test/alias/AbsSerializableAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/alias/AbsSerializableAc.ref.cpp index 5756c47d5..40de7de96 100644 --- a/compiler/tools/fpp-to-cpp/test/alias/AbsSerializableAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/alias/AbsSerializableAc.ref.cpp @@ -14,7 +14,7 @@ Abs :: Abs() : Serializable(), - m_A{} + m_A() { } diff --git a/compiler/tools/fpp-to-cpp/test/alias/BasicSerializableAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/alias/BasicSerializableAc.ref.cpp index 3cb4488d4..a1cdd8e73 100644 --- a/compiler/tools/fpp-to-cpp/test/alias/BasicSerializableAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/alias/BasicSerializableAc.ref.cpp @@ -14,8 +14,8 @@ Basic :: Basic() : Serializable(), - m_A{}, - m_B{}, + m_A(), + m_B(), m_C(m___fprime_ac_C_buffer, sizeof m___fprime_ac_C_buffer, Fw::String("")), m_D(m___fprime_ac_D_buffer, sizeof m___fprime_ac_D_buffer, Fw::String("")) { diff --git a/compiler/tools/fpp-to-cpp/test/alias/NamespaceSerializableAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/alias/NamespaceSerializableAc.ref.cpp index d70abcfaa..755820c8d 100644 --- a/compiler/tools/fpp-to-cpp/test/alias/NamespaceSerializableAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/alias/NamespaceSerializableAc.ref.cpp @@ -14,10 +14,10 @@ Namespace :: Namespace() : Serializable(), - m_A{}, - m_B{}, - m_C{}, - m_D{} + m_A(), + m_B(), + m_C(), + m_D() { } diff --git a/compiler/tools/fpp-to-cpp/test/array/AArrayAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/array/AArrayAc.ref.cpp index fb995eaa1..13efa8866 100644 --- a/compiler/tools/fpp-to-cpp/test/array/AArrayAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/array/AArrayAc.ref.cpp @@ -14,7 +14,7 @@ A :: A() : Serializable(), - elements{} + elements() { } diff --git a/compiler/tools/fpp-to-cpp/test/array/AbsTypeArrayAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/array/AbsTypeArrayAc.ref.cpp index 557f9eaf6..93f849e08 100644 --- a/compiler/tools/fpp-to-cpp/test/array/AbsTypeArrayAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/array/AbsTypeArrayAc.ref.cpp @@ -14,7 +14,7 @@ AbsType :: AbsType() : Serializable(), - elements{} + elements() { } diff --git a/compiler/tools/fpp-to-cpp/test/array/AliasTypeArrayAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/array/AliasTypeArrayAc.ref.cpp index de034b034..df9905607 100644 --- a/compiler/tools/fpp-to-cpp/test/array/AliasTypeArrayAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/array/AliasTypeArrayAc.ref.cpp @@ -14,7 +14,7 @@ AliasType :: AliasType() : Serializable(), - elements{} + elements() { *this = AliasType({0, 2, 3}); } 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 index df68c3562..d9213a8b5 100644 --- a/compiler/tools/fpp-to-cpp/test/array/C_AArrayAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/array/C_AArrayAc.ref.cpp @@ -14,7 +14,7 @@ C_A :: C_A() : Serializable(), - elements{} + elements() { } diff --git a/compiler/tools/fpp-to-cpp/test/array/Enum1ArrayAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/array/Enum1ArrayAc.ref.cpp index 947560930..23abba9b4 100644 --- a/compiler/tools/fpp-to-cpp/test/array/Enum1ArrayAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/array/Enum1ArrayAc.ref.cpp @@ -14,7 +14,7 @@ Enum1 :: Enum1() : Serializable(), - elements{} + elements() { *this = Enum1({M::E1::X, M::E1::Y}); } diff --git a/compiler/tools/fpp-to-cpp/test/array/Enum2ArrayAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/array/Enum2ArrayAc.ref.cpp index 5c35e67b7..fd1530ff3 100644 --- a/compiler/tools/fpp-to-cpp/test/array/Enum2ArrayAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/array/Enum2ArrayAc.ref.cpp @@ -14,7 +14,7 @@ Enum2 :: Enum2() : Serializable(), - elements{} + elements() { } diff --git a/compiler/tools/fpp-to-cpp/test/array/HeaderPathArrayAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/array/HeaderPathArrayAc.ref.cpp index e96238604..98593cf66 100644 --- a/compiler/tools/fpp-to-cpp/test/array/HeaderPathArrayAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/array/HeaderPathArrayAc.ref.cpp @@ -14,7 +14,7 @@ HeaderPath :: HeaderPath() : Serializable(), - elements{} + elements() { } diff --git a/compiler/tools/fpp-to-cpp/test/array/LargeSizeArrayAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/array/LargeSizeArrayAc.ref.cpp index 337d1143a..7738c0ba4 100644 --- a/compiler/tools/fpp-to-cpp/test/array/LargeSizeArrayAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/array/LargeSizeArrayAc.ref.cpp @@ -14,7 +14,7 @@ LargeSize :: LargeSize() : Serializable(), - elements{} + elements() { } diff --git a/compiler/tools/fpp-to-cpp/test/array/PrimitiveArrayArrayAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/array/PrimitiveArrayArrayAc.ref.cpp index 0f1b12dcb..65d51f56a 100644 --- a/compiler/tools/fpp-to-cpp/test/array/PrimitiveArrayArrayAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/array/PrimitiveArrayArrayAc.ref.cpp @@ -14,7 +14,7 @@ PrimitiveArray :: PrimitiveArray() : Serializable(), - elements{} + elements() { } diff --git a/compiler/tools/fpp-to-cpp/test/array/PrimitiveBoolArrayAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/array/PrimitiveBoolArrayAc.ref.cpp index ca5be02b6..ca0793ac2 100644 --- a/compiler/tools/fpp-to-cpp/test/array/PrimitiveBoolArrayAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/array/PrimitiveBoolArrayAc.ref.cpp @@ -16,7 +16,7 @@ namespace M { PrimitiveBool :: PrimitiveBool() : Serializable(), - elements{} + elements() { } diff --git a/compiler/tools/fpp-to-cpp/test/array/PrimitiveF32eArrayAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/array/PrimitiveF32eArrayAc.ref.cpp index 2bd0c20b4..c702638b4 100644 --- a/compiler/tools/fpp-to-cpp/test/array/PrimitiveF32eArrayAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/array/PrimitiveF32eArrayAc.ref.cpp @@ -16,7 +16,7 @@ namespace M { PrimitiveF32e :: PrimitiveF32e() : Serializable(), - elements{} + elements() { *this = M::PrimitiveF32e(1.0f); } diff --git a/compiler/tools/fpp-to-cpp/test/array/PrimitiveF32fArrayAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/array/PrimitiveF32fArrayAc.ref.cpp index e6a63e1f0..bf8f22aa5 100644 --- a/compiler/tools/fpp-to-cpp/test/array/PrimitiveF32fArrayAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/array/PrimitiveF32fArrayAc.ref.cpp @@ -16,7 +16,7 @@ namespace M { PrimitiveF32f :: PrimitiveF32f() : Serializable(), - elements{} + elements() { } diff --git a/compiler/tools/fpp-to-cpp/test/array/PrimitiveF64ArrayAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/array/PrimitiveF64ArrayAc.ref.cpp index 4af8a48a5..1f0ccde60 100644 --- a/compiler/tools/fpp-to-cpp/test/array/PrimitiveF64ArrayAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/array/PrimitiveF64ArrayAc.ref.cpp @@ -16,7 +16,7 @@ namespace M { PrimitiveF64 :: PrimitiveF64() : Serializable(), - elements{} + elements() { *this = M::PrimitiveF64({1.0, 2.0, 3.0, 4.0, 5.0}); } diff --git a/compiler/tools/fpp-to-cpp/test/array/PrimitiveI32ArrayAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/array/PrimitiveI32ArrayAc.ref.cpp index 498323ae0..e788a7452 100644 --- a/compiler/tools/fpp-to-cpp/test/array/PrimitiveI32ArrayAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/array/PrimitiveI32ArrayAc.ref.cpp @@ -16,7 +16,7 @@ namespace M { PrimitiveI32 :: PrimitiveI32() : Serializable(), - elements{} + elements() { } diff --git a/compiler/tools/fpp-to-cpp/test/array/PrimitiveI64ArrayAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/array/PrimitiveI64ArrayAc.ref.cpp index c5444297a..8deaba557 100644 --- a/compiler/tools/fpp-to-cpp/test/array/PrimitiveI64ArrayAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/array/PrimitiveI64ArrayAc.ref.cpp @@ -16,7 +16,7 @@ namespace M { PrimitiveI64 :: PrimitiveI64() : Serializable(), - elements{} + elements() { } diff --git a/compiler/tools/fpp-to-cpp/test/array/PrimitiveU16ArrayAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/array/PrimitiveU16ArrayAc.ref.cpp index f74ba661d..29f992072 100644 --- a/compiler/tools/fpp-to-cpp/test/array/PrimitiveU16ArrayAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/array/PrimitiveU16ArrayAc.ref.cpp @@ -16,7 +16,7 @@ namespace M { PrimitiveU16 :: PrimitiveU16() : Serializable(), - elements{} + elements() { *this = M::PrimitiveU16({1, 2, 3}); } diff --git a/compiler/tools/fpp-to-cpp/test/array/PrimitiveU8ArrayAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/array/PrimitiveU8ArrayAc.ref.cpp index 676b8c0d9..f9e91d6b4 100644 --- a/compiler/tools/fpp-to-cpp/test/array/PrimitiveU8ArrayAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/array/PrimitiveU8ArrayAc.ref.cpp @@ -16,7 +16,7 @@ namespace M { PrimitiveU8 :: PrimitiveU8() : Serializable(), - elements{} + elements() { } diff --git a/compiler/tools/fpp-to-cpp/test/array/S1SerializableAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/array/S1SerializableAc.ref.cpp index 246f5b1c4..1a4513119 100644 --- a/compiler/tools/fpp-to-cpp/test/array/S1SerializableAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/array/S1SerializableAc.ref.cpp @@ -16,17 +16,17 @@ namespace M { S1 :: S1() : Serializable(), - m_mF32{}, - m_mF64{}, - m_mI16{}, - m_mI32{}, - m_mI64{}, - m_mI8{}, - m_mU16{}, - m_mU32{}, - m_mU64{}, - m_mU8{}, - m_mBool{}, + m_mF32(), + m_mF64(), + m_mI16(), + m_mI32(), + m_mI64(), + m_mI8(), + m_mU16(), + m_mU32(), + m_mU64(), + m_mU8(), + m_mBool(), m_mString(m___fprime_ac_mString_buffer, sizeof m___fprime_ac_mString_buffer, Fw::String("")) { diff --git a/compiler/tools/fpp-to-cpp/test/array/S2SerializableAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/array/S2SerializableAc.ref.cpp index fc49552d0..d7368082d 100644 --- a/compiler/tools/fpp-to-cpp/test/array/S2SerializableAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/array/S2SerializableAc.ref.cpp @@ -14,7 +14,7 @@ S2 :: S2() : Serializable(), - m_s1{} + m_s1() { } diff --git a/compiler/tools/fpp-to-cpp/test/array/S3SerializableAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/array/S3SerializableAc.ref.cpp index 61ad76615..05fd96b42 100644 --- a/compiler/tools/fpp-to-cpp/test/array/S3SerializableAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/array/S3SerializableAc.ref.cpp @@ -16,8 +16,8 @@ namespace S { S3 :: S3() : Serializable(), - m_mU32Array{}, - m_mF64{} + m_mU32Array(), + m_mF64() { } diff --git a/compiler/tools/fpp-to-cpp/test/array/SWrapperSerializableAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/array/SWrapperSerializableAc.ref.cpp index 0860cbca9..67f913c64 100644 --- a/compiler/tools/fpp-to-cpp/test/array/SWrapperSerializableAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/array/SWrapperSerializableAc.ref.cpp @@ -14,7 +14,7 @@ SWrapper :: SWrapper() : Serializable(), - m_s{} + m_s() { } diff --git a/compiler/tools/fpp-to-cpp/test/array/SingleElementArrayAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/array/SingleElementArrayAc.ref.cpp index 0da5571e8..39229c16b 100644 --- a/compiler/tools/fpp-to-cpp/test/array/SingleElementArrayAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/array/SingleElementArrayAc.ref.cpp @@ -14,7 +14,7 @@ SingleElement :: SingleElement() : Serializable(), - elements{} + elements() { } diff --git a/compiler/tools/fpp-to-cpp/test/array/String1ArrayAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/array/String1ArrayAc.ref.cpp index 1e9ce572e..5f5cdeeec 100644 --- a/compiler/tools/fpp-to-cpp/test/array/String1ArrayAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/array/String1ArrayAc.ref.cpp @@ -14,7 +14,7 @@ String1 :: String1() : Serializable(), - elements{} + elements() { this->initElements(); } diff --git a/compiler/tools/fpp-to-cpp/test/array/String2ArrayAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/array/String2ArrayAc.ref.cpp index 53191acf9..925a3d3df 100644 --- a/compiler/tools/fpp-to-cpp/test/array/String2ArrayAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/array/String2ArrayAc.ref.cpp @@ -14,7 +14,7 @@ String2 :: String2() : Serializable(), - elements{} + elements() { this->initElements(); *this = String2({Fw::String("\"\\"), Fw::String("abc\ndef\n")}); diff --git a/compiler/tools/fpp-to-cpp/test/array/StringArrayArrayAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/array/StringArrayArrayAc.ref.cpp index 14d1cad8c..d5d7b5550 100644 --- a/compiler/tools/fpp-to-cpp/test/array/StringArrayArrayAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/array/StringArrayArrayAc.ref.cpp @@ -14,7 +14,7 @@ StringArray :: StringArray() : Serializable(), - elements{} + elements() { } diff --git a/compiler/tools/fpp-to-cpp/test/array/Struct1ArrayAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/array/Struct1ArrayAc.ref.cpp index cda7add91..c4d62d9f3 100644 --- a/compiler/tools/fpp-to-cpp/test/array/Struct1ArrayAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/array/Struct1ArrayAc.ref.cpp @@ -14,7 +14,7 @@ Struct1 :: Struct1() : Serializable(), - elements{} + elements() { } diff --git a/compiler/tools/fpp-to-cpp/test/array/Struct2ArrayAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/array/Struct2ArrayAc.ref.cpp index 8b3555bf3..4d197fd56 100644 --- a/compiler/tools/fpp-to-cpp/test/array/Struct2ArrayAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/array/Struct2ArrayAc.ref.cpp @@ -14,7 +14,7 @@ Struct2 :: Struct2() : Serializable(), - elements{} + elements() { } diff --git a/compiler/tools/fpp-to-cpp/test/array/Struct3ArrayAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/array/Struct3ArrayAc.ref.cpp index b4ba83497..191e6c98e 100644 --- a/compiler/tools/fpp-to-cpp/test/array/Struct3ArrayAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/array/Struct3ArrayAc.ref.cpp @@ -14,7 +14,7 @@ Struct3 :: Struct3() : Serializable(), - elements{} + elements() { } diff --git a/compiler/tools/fpp-to-cpp/test/array/Struct4ArrayAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/array/Struct4ArrayAc.ref.cpp index e62d9dcdd..47a336d5f 100644 --- a/compiler/tools/fpp-to-cpp/test/array/Struct4ArrayAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/array/Struct4ArrayAc.ref.cpp @@ -14,7 +14,7 @@ Struct4 :: Struct4() : Serializable(), - elements{} + elements() { } diff --git a/compiler/tools/fpp-to-cpp/test/component/base/AArrayAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/AArrayAc.ref.cpp index 13a8c5ede..d399c4d07 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/AArrayAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/AArrayAc.ref.cpp @@ -14,7 +14,7 @@ A :: A() : Serializable(), - elements{} + elements() { } diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ArrayAliasArrayArrayAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/ArrayAliasArrayArrayAc.ref.cpp index 28824206a..84b872624 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/ArrayAliasArrayArrayAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/ArrayAliasArrayArrayAc.ref.cpp @@ -14,7 +14,7 @@ ArrayAliasArray :: ArrayAliasArray() : Serializable(), - elements{} + elements() { } diff --git a/compiler/tools/fpp-to-cpp/test/component/base/SSerializableAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/SSerializableAc.ref.cpp index c4a2aea99..9efb39244 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/SSerializableAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/SSerializableAc.ref.cpp @@ -14,7 +14,7 @@ S :: S() : Serializable(), - m_x{}, + m_x(), m_y(m___fprime_ac_y_buffer, sizeof m___fprime_ac_y_buffer, Fw::String("")) { diff --git a/compiler/tools/fpp-to-cpp/test/component/base/StructWithAliasSerializableAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/StructWithAliasSerializableAc.ref.cpp index 919166a22..b59c848bb 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/StructWithAliasSerializableAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/StructWithAliasSerializableAc.ref.cpp @@ -14,11 +14,11 @@ StructWithAlias :: StructWithAlias() : Serializable(), - m_x{}, + m_x(), m_y(m___fprime_ac_y_buffer, sizeof m___fprime_ac_y_buffer, Fw::String("")), - m_z{}, - m_w{}, - m_q{} + m_z(), + m_w(), + m_q() { } diff --git a/compiler/tools/fpp-to-cpp/test/struct/AArrayAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/struct/AArrayAc.ref.cpp index 1d7c83ebf..35a1a5f1a 100644 --- a/compiler/tools/fpp-to-cpp/test/struct/AArrayAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/struct/AArrayAc.ref.cpp @@ -16,7 +16,7 @@ namespace M { A :: A() : Serializable(), - elements{} + elements() { } diff --git a/compiler/tools/fpp-to-cpp/test/struct/AbsTypeSerializableAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/struct/AbsTypeSerializableAc.ref.cpp index ec9dd5be8..067a652c9 100644 --- a/compiler/tools/fpp-to-cpp/test/struct/AbsTypeSerializableAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/struct/AbsTypeSerializableAc.ref.cpp @@ -14,7 +14,7 @@ AbsType :: AbsType() : Serializable(), - m_t{} + m_t() { } diff --git a/compiler/tools/fpp-to-cpp/test/struct/AliasTypeSerializableAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/struct/AliasTypeSerializableAc.ref.cpp index 54bb783e6..854b89587 100644 --- a/compiler/tools/fpp-to-cpp/test/struct/AliasTypeSerializableAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/struct/AliasTypeSerializableAc.ref.cpp @@ -14,8 +14,8 @@ AliasType :: AliasType() : Serializable(), - m_x{}, - m_y{} + m_x(), + m_y() { for (FwSizeType i = 0; i < 10; i++) { // Initialize the external string diff --git a/compiler/tools/fpp-to-cpp/test/struct/C_SSerializableAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/struct/C_SSerializableAc.ref.cpp index 3a8ec5b47..183cda6da 100644 --- a/compiler/tools/fpp-to-cpp/test/struct/C_SSerializableAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/struct/C_SSerializableAc.ref.cpp @@ -14,7 +14,7 @@ C_S :: C_S() : Serializable(), - m_x{} + m_x() { } diff --git a/compiler/tools/fpp-to-cpp/test/struct/DefaultSerializableAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/struct/DefaultSerializableAc.ref.cpp index a60fb528b..f910938ba 100644 --- a/compiler/tools/fpp-to-cpp/test/struct/DefaultSerializableAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/struct/DefaultSerializableAc.ref.cpp @@ -16,7 +16,7 @@ Default :: Serializable(), m_mU32(54), m_mS1(m___fprime_ac_mS1_buffer, sizeof m___fprime_ac_mS1_buffer, Fw::String("hello")), - m_mF64{} + m_mF64() { } diff --git a/compiler/tools/fpp-to-cpp/test/struct/EnumSerializableAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/struct/EnumSerializableAc.ref.cpp index fbafdc744..8b99904fb 100644 --- a/compiler/tools/fpp-to-cpp/test/struct/EnumSerializableAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/struct/EnumSerializableAc.ref.cpp @@ -14,8 +14,8 @@ Enum :: Enum() : Serializable(), - m_e{}, - m_eArr{} + m_e(), + m_eArr() { } diff --git a/compiler/tools/fpp-to-cpp/test/struct/FormatSerializableAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/struct/FormatSerializableAc.ref.cpp index ad8de4a26..94eae8699 100644 --- a/compiler/tools/fpp-to-cpp/test/struct/FormatSerializableAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/struct/FormatSerializableAc.ref.cpp @@ -14,23 +14,23 @@ Format :: Format() : Serializable(), - m_m1{}, - m_m2{}, - m_m3{}, - m_m4{}, - m_m5{}, - m_m6{}, - m_m7{}, - m_m8{}, - m_m9{}, - m_m10{}, - m_m11{}, - m_m12{}, - m_m13{}, - m_m14{}, - m_m15{}, - m_m16{}, - m_m17{} + m_m1(), + m_m2(), + m_m3(), + m_m4(), + m_m5(), + m_m6(), + m_m7(), + m_m8(), + m_m9(), + m_m10(), + m_m11(), + m_m12(), + m_m13(), + m_m14(), + m_m15(), + m_m16(), + m_m17() { } diff --git a/compiler/tools/fpp-to-cpp/test/struct/IncludedSerializableAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/struct/IncludedSerializableAc.ref.cpp index 222130707..0785cdbed 100644 --- a/compiler/tools/fpp-to-cpp/test/struct/IncludedSerializableAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/struct/IncludedSerializableAc.ref.cpp @@ -14,7 +14,7 @@ Included :: Included() : Serializable(), - m_x{} + m_x() { } diff --git a/compiler/tools/fpp-to-cpp/test/struct/IncludingSerializableAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/struct/IncludingSerializableAc.ref.cpp index 725b7e62a..a42a65647 100644 --- a/compiler/tools/fpp-to-cpp/test/struct/IncludingSerializableAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/struct/IncludingSerializableAc.ref.cpp @@ -14,7 +14,7 @@ Including :: Including() : Serializable(), - m_x{} + m_x() { } diff --git a/compiler/tools/fpp-to-cpp/test/struct/Modules1SerializableAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/struct/Modules1SerializableAc.ref.cpp index 09b092293..c4b7b6442 100644 --- a/compiler/tools/fpp-to-cpp/test/struct/Modules1SerializableAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/struct/Modules1SerializableAc.ref.cpp @@ -16,8 +16,8 @@ namespace M { Modules1 :: Modules1() : Serializable(), - m_x{}, - m_y{} + m_x(), + m_y() { } diff --git a/compiler/tools/fpp-to-cpp/test/struct/Modules2SerializableAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/struct/Modules2SerializableAc.ref.cpp index 2e426e6da..e7e2310d5 100644 --- a/compiler/tools/fpp-to-cpp/test/struct/Modules2SerializableAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/struct/Modules2SerializableAc.ref.cpp @@ -16,7 +16,7 @@ namespace M { Modules2 :: Modules2() : Serializable(), - m_x{} + m_x() { } diff --git a/compiler/tools/fpp-to-cpp/test/struct/Modules3SerializableAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/struct/Modules3SerializableAc.ref.cpp index 6fe901a61..bf84d5d57 100644 --- a/compiler/tools/fpp-to-cpp/test/struct/Modules3SerializableAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/struct/Modules3SerializableAc.ref.cpp @@ -14,8 +14,8 @@ Modules3 :: Modules3() : Serializable(), - m_x{}, - m_arr{} + m_x(), + m_arr() { } diff --git a/compiler/tools/fpp-to-cpp/test/struct/Modules4SerializableAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/struct/Modules4SerializableAc.ref.cpp index 85c92093b..30eeaac54 100644 --- a/compiler/tools/fpp-to-cpp/test/struct/Modules4SerializableAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/struct/Modules4SerializableAc.ref.cpp @@ -14,8 +14,8 @@ Modules4 :: Modules4() : Serializable(), - m_arr1{}, - m_arr2{} + m_arr1(), + m_arr2() { } diff --git a/compiler/tools/fpp-to-cpp/test/struct/PrimitiveSerializableAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/struct/PrimitiveSerializableAc.ref.cpp index f2d827f11..462fb521c 100644 --- a/compiler/tools/fpp-to-cpp/test/struct/PrimitiveSerializableAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/struct/PrimitiveSerializableAc.ref.cpp @@ -14,17 +14,17 @@ Primitive :: Primitive() : Serializable(), - m_mF32{}, - m_mF64{}, - m_mI16{}, - m_mI32{}, - m_mI64{}, - m_mI8{}, - m_mU16{}, - m_mU32{}, - m_mU64{}, - m_mU8{}, - m_m_bool{}, + m_mF32(), + m_mF64(), + m_mI16(), + m_mI32(), + m_mI64(), + m_mI8(), + m_mU16(), + m_mU32(), + m_mU64(), + m_mU8(), + m_m_bool(), m_m_string(m___fprime_ac_m_string_buffer, sizeof m___fprime_ac_m_string_buffer, Fw::String("")) { diff --git a/compiler/tools/fpp-to-cpp/test/struct/PrimitiveStructSerializableAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/struct/PrimitiveStructSerializableAc.ref.cpp index b584db01d..9d2226922 100644 --- a/compiler/tools/fpp-to-cpp/test/struct/PrimitiveStructSerializableAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/struct/PrimitiveStructSerializableAc.ref.cpp @@ -14,7 +14,7 @@ PrimitiveStruct :: PrimitiveStruct() : Serializable(), - m_s1{} + m_s1() { } diff --git a/compiler/tools/fpp-to-cpp/test/struct/SSerializableAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/struct/SSerializableAc.ref.cpp index a9e359849..d6384e641 100644 --- a/compiler/tools/fpp-to-cpp/test/struct/SSerializableAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/struct/SSerializableAc.ref.cpp @@ -14,7 +14,7 @@ S :: S() : Serializable(), - m_x{} + m_x() { } diff --git a/compiler/trace-fprime b/compiler/trace-fprime index 61ef9c701..e53625d16 100755 --- a/compiler/trace-fprime +++ b/compiler/trace-fprime @@ -5,7 +5,7 @@ wd=`dirname $0` cd $wd # Make is used because it is single-string and thus doesn't trip tracing's lock-file contention -fprime_generate_flags="-f -DFPRIME_SKIP_TOOLS_VERSION_CHECK=ON --ut --make" +fprime_generate_flags="-f -DFPRIME_SKIP_TOOLS_VERSION_CHECK=ON -DFPRIME_ENABLE_JSON_MODEL_GENERATION=ON --ut --make" fprime_project_paths=". ./FppTestProject/FppTest ./Ref" @@ -32,9 +32,8 @@ do echo "Generating and Building UTs for: ${project_path}" cd "${FPRIME}/${project_path}" - # Conduct tracing through FPP build + # Conduct tracing through F Prime generate fprime-util generate ${fprime_generate_flags} - fprime-util build --ut done # Add in tracing for the specific CI test for fpp-to-json as this seems to be particularly unhappy.