Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@
{
"name":"[Lio.circe.Encoder;"
},
{
"name":"[Ljava.io.File;"
},
{
"name":"[Ljava.lang.String;"
},
Expand Down Expand Up @@ -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"}]
Expand Down Expand Up @@ -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"}]
Expand Down Expand Up @@ -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"}]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ case class ArrayCppWriter (
Nil,
List(
"Serializable()",
"elements{}"
"elements()"
),
List.concat(
initElementsCall,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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()"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
Abs ::
Abs() :
Serializable(),
m_A{}
m_A()
{

}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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(""))
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@
Namespace ::
Namespace() :
Serializable(),
m_A{},
m_B{},
m_C{},
m_D{}
m_A(),
m_B(),
m_C(),
m_D()
{

}
Expand Down
2 changes: 1 addition & 1 deletion compiler/tools/fpp-to-cpp/test/array/AArrayAc.ref.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
A ::
A() :
Serializable(),
elements{}
elements()
{

}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
AbsType ::
AbsType() :
Serializable(),
elements{}
elements()
{

}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
AliasType ::
AliasType() :
Serializable(),
elements{}
elements()
{
*this = AliasType({0, 2, 3});
}
Expand Down
2 changes: 1 addition & 1 deletion compiler/tools/fpp-to-cpp/test/array/C_AArrayAc.ref.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
C_A ::
C_A() :
Serializable(),
elements{}
elements()
{

}
Expand Down
2 changes: 1 addition & 1 deletion compiler/tools/fpp-to-cpp/test/array/Enum1ArrayAc.ref.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
Enum1 ::
Enum1() :
Serializable(),
elements{}
elements()
{
*this = Enum1({M::E1::X, M::E1::Y});
}
Expand Down
2 changes: 1 addition & 1 deletion compiler/tools/fpp-to-cpp/test/array/Enum2ArrayAc.ref.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
Enum2 ::
Enum2() :
Serializable(),
elements{}
elements()
{

}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
HeaderPath ::
HeaderPath() :
Serializable(),
elements{}
elements()
{

}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
LargeSize ::
LargeSize() :
Serializable(),
elements{}
elements()
{

}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
PrimitiveArray ::
PrimitiveArray() :
Serializable(),
elements{}
elements()
{

}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ namespace M {
PrimitiveBool ::
PrimitiveBool() :
Serializable(),
elements{}
elements()
{

}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ namespace M {
PrimitiveF32e ::
PrimitiveF32e() :
Serializable(),
elements{}
elements()
{
*this = M::PrimitiveF32e(1.0f);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ namespace M {
PrimitiveF32f ::
PrimitiveF32f() :
Serializable(),
elements{}
elements()
{

}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ namespace M {
PrimitiveF64 ::
PrimitiveF64() :
Serializable(),
elements{}
elements()
{
*this = M::PrimitiveF64({1.0, 2.0, 3.0, 4.0, 5.0});
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ namespace M {
PrimitiveI32 ::
PrimitiveI32() :
Serializable(),
elements{}
elements()
{

}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ namespace M {
PrimitiveI64 ::
PrimitiveI64() :
Serializable(),
elements{}
elements()
{

}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ namespace M {
PrimitiveU16 ::
PrimitiveU16() :
Serializable(),
elements{}
elements()
{
*this = M::PrimitiveU16({1, 2, 3});
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ namespace M {
PrimitiveU8 ::
PrimitiveU8() :
Serializable(),
elements{}
elements()
{

}
Expand Down
22 changes: 11 additions & 11 deletions compiler/tools/fpp-to-cpp/test/array/S1SerializableAc.ref.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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(""))
{

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
S2 ::
S2() :
Serializable(),
m_s1{}
m_s1()
{

}
Expand Down
4 changes: 2 additions & 2 deletions compiler/tools/fpp-to-cpp/test/array/S3SerializableAc.ref.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ namespace S {
S3 ::
S3() :
Serializable(),
m_mU32Array{},
m_mF64{}
m_mU32Array(),
m_mF64()
{

}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
SWrapper ::
SWrapper() :
Serializable(),
m_s{}
m_s()
{

}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
SingleElement ::
SingleElement() :
Serializable(),
elements{}
elements()
{

}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
String1 ::
String1() :
Serializable(),
elements{}
elements()
{
this->initElements();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
String2 ::
String2() :
Serializable(),
elements{}
elements()
{
this->initElements();
*this = String2({Fw::String("\"\\"), Fw::String("abc\ndef\n")});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
StringArray ::
StringArray() :
Serializable(),
elements{}
elements()
{

}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
Struct1 ::
Struct1() :
Serializable(),
elements{}
elements()
{

}
Expand Down
Loading