Skip to content

Commit d2b79cf

Browse files
committed
Revise C++ code gen
Use () instead of {} for default initialization
1 parent d72c41c commit d2b79cf

File tree

54 files changed

+103
-103
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+103
-103
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ case class ArrayCppWriter (
179179
Nil,
180180
List(
181181
"Serializable()",
182-
"elements{}"
182+
"elements()"
183183
),
184184
List.concat(
185185
initElementsCall,

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ case class StructCppWriter(
214214
Some("Constructor (default value)"),
215215
Nil,
216216
"Serializable()" :: initializerListMemberNames.map(n => {
217-
if defaultMemberNames.contains(n) then s"m_$n{}"
217+
if defaultMemberNames.contains(n) then s"m_$n()"
218218
else defaultValueMembers(n) match {
219219
case v: Value.Struct => s"m_$n(${ValueCppWriter.writeStructMembers(s, v)})"
220220
case _: Value.AbsType => s"m_$n()"

compiler/tools/fpp-to-cpp/test/alias/AbsSerializableAc.ref.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
Abs ::
1515
Abs() :
1616
Serializable(),
17-
m_A{}
17+
m_A()
1818
{
1919

2020
}

compiler/tools/fpp-to-cpp/test/alias/BasicSerializableAc.ref.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
Basic ::
1515
Basic() :
1616
Serializable(),
17-
m_A{},
18-
m_B{},
17+
m_A(),
18+
m_B(),
1919
m_C(m___fprime_ac_C_buffer, sizeof m___fprime_ac_C_buffer, Fw::String("")),
2020
m_D(m___fprime_ac_D_buffer, sizeof m___fprime_ac_D_buffer, Fw::String(""))
2121
{

compiler/tools/fpp-to-cpp/test/alias/NamespaceSerializableAc.ref.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@
1414
Namespace ::
1515
Namespace() :
1616
Serializable(),
17-
m_A{},
18-
m_B{},
19-
m_C{},
20-
m_D{}
17+
m_A(),
18+
m_B(),
19+
m_C(),
20+
m_D()
2121
{
2222

2323
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
A ::
1515
A() :
1616
Serializable(),
17-
elements{}
17+
elements()
1818
{
1919

2020
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
AbsType ::
1515
AbsType() :
1616
Serializable(),
17-
elements{}
17+
elements()
1818
{
1919

2020
}

compiler/tools/fpp-to-cpp/test/array/AliasTypeArrayAc.ref.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
AliasType ::
1515
AliasType() :
1616
Serializable(),
17-
elements{}
17+
elements()
1818
{
1919
*this = AliasType({0, 2, 3});
2020
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
C_A ::
1515
C_A() :
1616
Serializable(),
17-
elements{}
17+
elements()
1818
{
1919

2020
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
Enum1 ::
1515
Enum1() :
1616
Serializable(),
17-
elements{}
17+
elements()
1818
{
1919
*this = Enum1({M::E1::X, M::E1::Y});
2020
}

0 commit comments

Comments
 (0)