From 2858c25673e1d604a00e0541e8e56ef92272467b Mon Sep 17 00:00:00 2001 From: Simone Morettini Date: Fri, 19 Jan 2024 17:01:48 +0000 Subject: [PATCH] Added void keyword for unused variables --- .../ComponentCppWriter/ComponentCommands.scala | 7 ++++++- .../component/base/ActiveCommandsComponentAc.ref.cpp | 10 ++++++++++ .../component/base/ActiveSerialComponentAc.ref.cpp | 10 ++++++++++ .../test/component/base/ActiveTestComponentAc.ref.cpp | 10 ++++++++++ .../component/base/QueuedCommandsComponentAc.ref.cpp | 10 ++++++++++ .../component/base/QueuedSerialComponentAc.ref.cpp | 10 ++++++++++ .../test/component/base/QueuedTestComponentAc.ref.cpp | 10 ++++++++++ 7 files changed, 66 insertions(+), 1 deletion(-) diff --git a/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentCommands.scala b/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentCommands.scala index f0efb637f..eeacbff77 100644 --- a/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentCommands.scala +++ b/compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentCommands.scala @@ -306,7 +306,12 @@ case class ComponentCommands ( cmdSeqParam ), CppDoc.Type("void"), - lines("// Defaults to no-op; can be overridden"), + lines( + s"""|// Defaults to no-op; can be overridden + |(void) opCode; + |(void) cmdSeq; + |""" + ), CppDoc.Function.Virtual ) ) diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveCommandsComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveCommandsComponentAc.ref.cpp index 42f05f3e6..68d21e515 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveCommandsComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveCommandsComponentAc.ref.cpp @@ -3588,6 +3588,8 @@ void ActiveCommandsComponentBase :: ) { // Defaults to no-op; can be overridden + (void) opCode; + (void) cmdSeq; } void ActiveCommandsComponentBase :: @@ -3597,6 +3599,8 @@ void ActiveCommandsComponentBase :: ) { // Defaults to no-op; can be overridden + (void) opCode; + (void) cmdSeq; } void ActiveCommandsComponentBase :: @@ -3606,6 +3610,8 @@ void ActiveCommandsComponentBase :: ) { // Defaults to no-op; can be overridden + (void) opCode; + (void) cmdSeq; } void ActiveCommandsComponentBase :: @@ -3615,6 +3621,8 @@ void ActiveCommandsComponentBase :: ) { // Defaults to no-op; can be overridden + (void) opCode; + (void) cmdSeq; } void ActiveCommandsComponentBase :: @@ -3624,6 +3632,8 @@ void ActiveCommandsComponentBase :: ) { // Defaults to no-op; can be overridden + (void) opCode; + (void) cmdSeq; } // ---------------------------------------------------------------------- diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveSerialComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveSerialComponentAc.ref.cpp index 6f40fb95b..47a7fc93e 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveSerialComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveSerialComponentAc.ref.cpp @@ -4810,6 +4810,8 @@ void ActiveSerialComponentBase :: ) { // Defaults to no-op; can be overridden + (void) opCode; + (void) cmdSeq; } void ActiveSerialComponentBase :: @@ -4819,6 +4821,8 @@ void ActiveSerialComponentBase :: ) { // Defaults to no-op; can be overridden + (void) opCode; + (void) cmdSeq; } void ActiveSerialComponentBase :: @@ -4828,6 +4832,8 @@ void ActiveSerialComponentBase :: ) { // Defaults to no-op; can be overridden + (void) opCode; + (void) cmdSeq; } void ActiveSerialComponentBase :: @@ -4837,6 +4843,8 @@ void ActiveSerialComponentBase :: ) { // Defaults to no-op; can be overridden + (void) opCode; + (void) cmdSeq; } void ActiveSerialComponentBase :: @@ -4846,6 +4854,8 @@ void ActiveSerialComponentBase :: ) { // Defaults to no-op; can be overridden + (void) opCode; + (void) cmdSeq; } // ---------------------------------------------------------------------- diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveTestComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveTestComponentAc.ref.cpp index 79ba68f53..376afb44f 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/ActiveTestComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/ActiveTestComponentAc.ref.cpp @@ -4591,6 +4591,8 @@ namespace M { ) { // Defaults to no-op; can be overridden + (void) opCode; + (void) cmdSeq; } void ActiveTestComponentBase :: @@ -4600,6 +4602,8 @@ namespace M { ) { // Defaults to no-op; can be overridden + (void) opCode; + (void) cmdSeq; } void ActiveTestComponentBase :: @@ -4609,6 +4613,8 @@ namespace M { ) { // Defaults to no-op; can be overridden + (void) opCode; + (void) cmdSeq; } void ActiveTestComponentBase :: @@ -4618,6 +4624,8 @@ namespace M { ) { // Defaults to no-op; can be overridden + (void) opCode; + (void) cmdSeq; } void ActiveTestComponentBase :: @@ -4627,6 +4635,8 @@ namespace M { ) { // Defaults to no-op; can be overridden + (void) opCode; + (void) cmdSeq; } // ---------------------------------------------------------------------- diff --git a/compiler/tools/fpp-to-cpp/test/component/base/QueuedCommandsComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/QueuedCommandsComponentAc.ref.cpp index b6eb1af0d..a19101d9f 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/QueuedCommandsComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/QueuedCommandsComponentAc.ref.cpp @@ -3588,6 +3588,8 @@ void QueuedCommandsComponentBase :: ) { // Defaults to no-op; can be overridden + (void) opCode; + (void) cmdSeq; } void QueuedCommandsComponentBase :: @@ -3597,6 +3599,8 @@ void QueuedCommandsComponentBase :: ) { // Defaults to no-op; can be overridden + (void) opCode; + (void) cmdSeq; } void QueuedCommandsComponentBase :: @@ -3606,6 +3610,8 @@ void QueuedCommandsComponentBase :: ) { // Defaults to no-op; can be overridden + (void) opCode; + (void) cmdSeq; } void QueuedCommandsComponentBase :: @@ -3615,6 +3621,8 @@ void QueuedCommandsComponentBase :: ) { // Defaults to no-op; can be overridden + (void) opCode; + (void) cmdSeq; } void QueuedCommandsComponentBase :: @@ -3624,6 +3632,8 @@ void QueuedCommandsComponentBase :: ) { // Defaults to no-op; can be overridden + (void) opCode; + (void) cmdSeq; } // ---------------------------------------------------------------------- diff --git a/compiler/tools/fpp-to-cpp/test/component/base/QueuedSerialComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/QueuedSerialComponentAc.ref.cpp index fdad9a73f..512fdf97d 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/QueuedSerialComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/QueuedSerialComponentAc.ref.cpp @@ -4810,6 +4810,8 @@ void QueuedSerialComponentBase :: ) { // Defaults to no-op; can be overridden + (void) opCode; + (void) cmdSeq; } void QueuedSerialComponentBase :: @@ -4819,6 +4821,8 @@ void QueuedSerialComponentBase :: ) { // Defaults to no-op; can be overridden + (void) opCode; + (void) cmdSeq; } void QueuedSerialComponentBase :: @@ -4828,6 +4832,8 @@ void QueuedSerialComponentBase :: ) { // Defaults to no-op; can be overridden + (void) opCode; + (void) cmdSeq; } void QueuedSerialComponentBase :: @@ -4837,6 +4843,8 @@ void QueuedSerialComponentBase :: ) { // Defaults to no-op; can be overridden + (void) opCode; + (void) cmdSeq; } void QueuedSerialComponentBase :: @@ -4846,6 +4854,8 @@ void QueuedSerialComponentBase :: ) { // Defaults to no-op; can be overridden + (void) opCode; + (void) cmdSeq; } // ---------------------------------------------------------------------- diff --git a/compiler/tools/fpp-to-cpp/test/component/base/QueuedTestComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/QueuedTestComponentAc.ref.cpp index c9f196a08..9c0acfd23 100644 --- a/compiler/tools/fpp-to-cpp/test/component/base/QueuedTestComponentAc.ref.cpp +++ b/compiler/tools/fpp-to-cpp/test/component/base/QueuedTestComponentAc.ref.cpp @@ -4589,6 +4589,8 @@ void QueuedTestComponentBase :: ) { // Defaults to no-op; can be overridden + (void) opCode; + (void) cmdSeq; } void QueuedTestComponentBase :: @@ -4598,6 +4600,8 @@ void QueuedTestComponentBase :: ) { // Defaults to no-op; can be overridden + (void) opCode; + (void) cmdSeq; } void QueuedTestComponentBase :: @@ -4607,6 +4611,8 @@ void QueuedTestComponentBase :: ) { // Defaults to no-op; can be overridden + (void) opCode; + (void) cmdSeq; } void QueuedTestComponentBase :: @@ -4616,6 +4622,8 @@ void QueuedTestComponentBase :: ) { // Defaults to no-op; can be overridden + (void) opCode; + (void) cmdSeq; } void QueuedTestComponentBase :: @@ -4625,6 +4633,8 @@ void QueuedTestComponentBase :: ) { // Defaults to no-op; can be overridden + (void) opCode; + (void) cmdSeq; } // ----------------------------------------------------------------------