Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix missing assert conversion #400

Merged
merged 2 commits into from
Apr 10, 2024
Merged

Fix missing assert conversion #400

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
89c1768
Fix assert
JohanBertrand Apr 8, 2024
38f8cc7
Fixed unit tests
JohanBertrand Apr 9, 2024
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
4 changes: 2 additions & 2 deletions compiler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentInputPorts.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,7 @@ case class ComponentInputPorts(
"""|FW_ASSERT(callComp);
|
|const U32 idBase = callComp->getIdBase();
|FW_ASSERT(opCode >= idBase, opCode, idBase);
|FW_ASSERT(opCode >= idBase, static_cast<FwAssertArgType>(opCode), static_cast<FwAssertArgType>(idBase));
|"""
)
else List(
Expand All @@ -285,7 +285,7 @@ case class ComponentInputPorts(
|$className* compPtr = static_cast<$className*>(callComp);
|
|const U32 idBase = callComp->getIdBase();
|FW_ASSERT(opCode >= idBase, opCode, idBase);
|FW_ASSERT(opCode >= idBase, static_cast<FwAssertArgType>(opCode), static_cast<FwAssertArgType>(idBase));
|
|// Select base class function based on opcode
|"""
Expand Down
2 changes: 1 addition & 1 deletion compiler/tools/fpp-to-cpp/test/component/base/ActiveAsyncProductsComponentAc.ref.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3252,7 +3252,7 @@ void ActiveAsyncProductsComponentBase ::
FW_ASSERT(callComp);

const U32 idBase = callComp->getIdBase();
FW_ASSERT(opCode >= idBase, opCode, idBase);
FW_ASSERT(opCode >= idBase, static_cast<FwAssertArgType>(opCode), static_cast<FwAssertArgType>(idBase));
}

void ActiveAsyncProductsComponentBase ::
Expand Down
2 changes: 1 addition & 1 deletion compiler/tools/fpp-to-cpp/test/component/base/ActiveCommandsComponentAc.ref.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4099,7 +4099,7 @@ void ActiveCommandsComponentBase ::
ActiveCommandsComponentBase* compPtr = static_cast<ActiveCommandsComponentBase*>(callComp);

const U32 idBase = callComp->getIdBase();
FW_ASSERT(opCode >= idBase, opCode, idBase);
FW_ASSERT(opCode >= idBase, static_cast<FwAssertArgType>(opCode), static_cast<FwAssertArgType>(idBase));

// Select base class function based on opcode
switch (opCode - idBase) {
Expand Down
2 changes: 1 addition & 1 deletion compiler/tools/fpp-to-cpp/test/component/base/ActiveEventsComponentAc.ref.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3424,7 +3424,7 @@ void ActiveEventsComponentBase ::
FW_ASSERT(callComp);

const U32 idBase = callComp->getIdBase();
FW_ASSERT(opCode >= idBase, opCode, idBase);
FW_ASSERT(opCode >= idBase, static_cast<FwAssertArgType>(opCode), static_cast<FwAssertArgType>(idBase));
}

// ----------------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion compiler/tools/fpp-to-cpp/test/component/base/ActiveGetProductsComponentAc.ref.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3065,7 +3065,7 @@ void ActiveGetProductsComponentBase ::
FW_ASSERT(callComp);

const U32 idBase = callComp->getIdBase();
FW_ASSERT(opCode >= idBase, opCode, idBase);
FW_ASSERT(opCode >= idBase, static_cast<FwAssertArgType>(opCode), static_cast<FwAssertArgType>(idBase));
}

// ----------------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion compiler/tools/fpp-to-cpp/test/component/base/ActiveGuardedProductsComponentAc.ref.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3172,7 +3172,7 @@ void ActiveGuardedProductsComponentBase ::
FW_ASSERT(callComp);

const U32 idBase = callComp->getIdBase();
FW_ASSERT(opCode >= idBase, opCode, idBase);
FW_ASSERT(opCode >= idBase, static_cast<FwAssertArgType>(opCode), static_cast<FwAssertArgType>(idBase));
}

void ActiveGuardedProductsComponentBase ::
Expand Down
2 changes: 1 addition & 1 deletion compiler/tools/fpp-to-cpp/test/component/base/ActiveParamsComponentAc.ref.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3067,7 +3067,7 @@ void ActiveParamsComponentBase ::
ActiveParamsComponentBase* compPtr = static_cast<ActiveParamsComponentBase*>(callComp);

const U32 idBase = callComp->getIdBase();
FW_ASSERT(opCode >= idBase, opCode, idBase);
FW_ASSERT(opCode >= idBase, static_cast<FwAssertArgType>(opCode), static_cast<FwAssertArgType>(idBase));

// Select base class function based on opcode
switch (opCode - idBase) {
Expand Down
2 changes: 1 addition & 1 deletion compiler/tools/fpp-to-cpp/test/component/base/ActiveSerialComponentAc.ref.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6678,7 +6678,7 @@ void ActiveSerialComponentBase ::
ActiveSerialComponentBase* compPtr = static_cast<ActiveSerialComponentBase*>(callComp);

const U32 idBase = callComp->getIdBase();
FW_ASSERT(opCode >= idBase, opCode, idBase);
FW_ASSERT(opCode >= idBase, static_cast<FwAssertArgType>(opCode), static_cast<FwAssertArgType>(idBase));

// Select base class function based on opcode
switch (opCode - idBase) {
Expand Down
2 changes: 1 addition & 1 deletion compiler/tools/fpp-to-cpp/test/component/base/ActiveSyncProductsComponentAc.ref.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3166,7 +3166,7 @@ void ActiveSyncProductsComponentBase ::
FW_ASSERT(callComp);

const U32 idBase = callComp->getIdBase();
FW_ASSERT(opCode >= idBase, opCode, idBase);
FW_ASSERT(opCode >= idBase, static_cast<FwAssertArgType>(opCode), static_cast<FwAssertArgType>(idBase));
}

void ActiveSyncProductsComponentBase ::
Expand Down
2 changes: 1 addition & 1 deletion compiler/tools/fpp-to-cpp/test/component/base/ActiveTelemetryComponentAc.ref.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3129,7 +3129,7 @@ void ActiveTelemetryComponentBase ::
FW_ASSERT(callComp);

const U32 idBase = callComp->getIdBase();
FW_ASSERT(opCode >= idBase, opCode, idBase);
FW_ASSERT(opCode >= idBase, static_cast<FwAssertArgType>(opCode), static_cast<FwAssertArgType>(idBase));
}

// ----------------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion compiler/tools/fpp-to-cpp/test/component/base/ActiveTestComponentAc.ref.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6496,7 +6496,7 @@ namespace M {
ActiveTestComponentBase* compPtr = static_cast<ActiveTestComponentBase*>(callComp);

const U32 idBase = callComp->getIdBase();
FW_ASSERT(opCode >= idBase, opCode, idBase);
FW_ASSERT(opCode >= idBase, static_cast<FwAssertArgType>(opCode), static_cast<FwAssertArgType>(idBase));

// Select base class function based on opcode
switch (opCode - idBase) {
Expand Down
2 changes: 1 addition & 1 deletion compiler/tools/fpp-to-cpp/test/component/base/PassiveCommandsComponentAc.ref.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2269,7 +2269,7 @@ void PassiveCommandsComponentBase ::
PassiveCommandsComponentBase* compPtr = static_cast<PassiveCommandsComponentBase*>(callComp);

const U32 idBase = callComp->getIdBase();
FW_ASSERT(opCode >= idBase, opCode, idBase);
FW_ASSERT(opCode >= idBase, static_cast<FwAssertArgType>(opCode), static_cast<FwAssertArgType>(idBase));

// Select base class function based on opcode
switch (opCode - idBase) {
Expand Down
2 changes: 1 addition & 1 deletion compiler/tools/fpp-to-cpp/test/component/base/PassiveEventsComponentAc.ref.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2258,7 +2258,7 @@ void PassiveEventsComponentBase ::
FW_ASSERT(callComp);

const U32 idBase = callComp->getIdBase();
FW_ASSERT(opCode >= idBase, opCode, idBase);
FW_ASSERT(opCode >= idBase, static_cast<FwAssertArgType>(opCode), static_cast<FwAssertArgType>(idBase));
}

// ----------------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion compiler/tools/fpp-to-cpp/test/component/base/PassiveGetProductsComponentAc.ref.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1899,7 +1899,7 @@ void PassiveGetProductsComponentBase ::
FW_ASSERT(callComp);

const U32 idBase = callComp->getIdBase();
FW_ASSERT(opCode >= idBase, opCode, idBase);
FW_ASSERT(opCode >= idBase, static_cast<FwAssertArgType>(opCode), static_cast<FwAssertArgType>(idBase));
}

// ----------------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion compiler/tools/fpp-to-cpp/test/component/base/PassiveGuardedProductsComponentAc.ref.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2006,7 +2006,7 @@ void PassiveGuardedProductsComponentBase ::
FW_ASSERT(callComp);

const U32 idBase = callComp->getIdBase();
FW_ASSERT(opCode >= idBase, opCode, idBase);
FW_ASSERT(opCode >= idBase, static_cast<FwAssertArgType>(opCode), static_cast<FwAssertArgType>(idBase));
}

void PassiveGuardedProductsComponentBase ::
Expand Down
2 changes: 1 addition & 1 deletion compiler/tools/fpp-to-cpp/test/component/base/PassiveParamsComponentAc.ref.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1901,7 +1901,7 @@ void PassiveParamsComponentBase ::
PassiveParamsComponentBase* compPtr = static_cast<PassiveParamsComponentBase*>(callComp);

const U32 idBase = callComp->getIdBase();
FW_ASSERT(opCode >= idBase, opCode, idBase);
FW_ASSERT(opCode >= idBase, static_cast<FwAssertArgType>(opCode), static_cast<FwAssertArgType>(idBase));

// Select base class function based on opcode
switch (opCode - idBase) {
Expand Down
2 changes: 1 addition & 1 deletion compiler/tools/fpp-to-cpp/test/component/base/PassiveSerialComponentAc.ref.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3911,7 +3911,7 @@ void PassiveSerialComponentBase ::
PassiveSerialComponentBase* compPtr = static_cast<PassiveSerialComponentBase*>(callComp);

const U32 idBase = callComp->getIdBase();
FW_ASSERT(opCode >= idBase, opCode, idBase);
FW_ASSERT(opCode >= idBase, static_cast<FwAssertArgType>(opCode), static_cast<FwAssertArgType>(idBase));

// Select base class function based on opcode
switch (opCode - idBase) {
Expand Down
2 changes: 1 addition & 1 deletion compiler/tools/fpp-to-cpp/test/component/base/PassiveSyncProductsComponentAc.ref.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2000,7 +2000,7 @@ void PassiveSyncProductsComponentBase ::
FW_ASSERT(callComp);

const U32 idBase = callComp->getIdBase();
FW_ASSERT(opCode >= idBase, opCode, idBase);
FW_ASSERT(opCode >= idBase, static_cast<FwAssertArgType>(opCode), static_cast<FwAssertArgType>(idBase));
}

void PassiveSyncProductsComponentBase ::
Expand Down
2 changes: 1 addition & 1 deletion compiler/tools/fpp-to-cpp/test/component/base/PassiveTelemetryComponentAc.ref.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1963,7 +1963,7 @@ void PassiveTelemetryComponentBase ::
FW_ASSERT(callComp);

const U32 idBase = callComp->getIdBase();
FW_ASSERT(opCode >= idBase, opCode, idBase);
FW_ASSERT(opCode >= idBase, static_cast<FwAssertArgType>(opCode), static_cast<FwAssertArgType>(idBase));
}

// ----------------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion compiler/tools/fpp-to-cpp/test/component/base/PassiveTestComponentAc.ref.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4125,7 +4125,7 @@ void PassiveTestComponentBase ::
PassiveTestComponentBase* compPtr = static_cast<PassiveTestComponentBase*>(callComp);

const U32 idBase = callComp->getIdBase();
FW_ASSERT(opCode >= idBase, opCode, idBase);
FW_ASSERT(opCode >= idBase, static_cast<FwAssertArgType>(opCode), static_cast<FwAssertArgType>(idBase));

// Select base class function based on opcode
switch (opCode - idBase) {
Expand Down
2 changes: 1 addition & 1 deletion compiler/tools/fpp-to-cpp/test/component/base/QueuedAsyncProductsComponentAc.ref.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3252,7 +3252,7 @@ void QueuedAsyncProductsComponentBase ::
FW_ASSERT(callComp);

const U32 idBase = callComp->getIdBase();
FW_ASSERT(opCode >= idBase, opCode, idBase);
FW_ASSERT(opCode >= idBase, static_cast<FwAssertArgType>(opCode), static_cast<FwAssertArgType>(idBase));
}

void QueuedAsyncProductsComponentBase ::
Expand Down
2 changes: 1 addition & 1 deletion compiler/tools/fpp-to-cpp/test/component/base/QueuedCommandsComponentAc.ref.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4104,7 +4104,7 @@ void QueuedCommandsComponentBase ::
QueuedCommandsComponentBase* compPtr = static_cast<QueuedCommandsComponentBase*>(callComp);

const U32 idBase = callComp->getIdBase();
FW_ASSERT(opCode >= idBase, opCode, idBase);
FW_ASSERT(opCode >= idBase, static_cast<FwAssertArgType>(opCode), static_cast<FwAssertArgType>(idBase));

// Select base class function based on opcode
switch (opCode - idBase) {
Expand Down
2 changes: 1 addition & 1 deletion compiler/tools/fpp-to-cpp/test/component/base/QueuedEventsComponentAc.ref.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3429,7 +3429,7 @@ void QueuedEventsComponentBase ::
FW_ASSERT(callComp);

const U32 idBase = callComp->getIdBase();
FW_ASSERT(opCode >= idBase, opCode, idBase);
FW_ASSERT(opCode >= idBase, static_cast<FwAssertArgType>(opCode), static_cast<FwAssertArgType>(idBase));
}

// ----------------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion compiler/tools/fpp-to-cpp/test/component/base/QueuedGetProductsComponentAc.ref.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3065,7 +3065,7 @@ void QueuedGetProductsComponentBase ::
FW_ASSERT(callComp);

const U32 idBase = callComp->getIdBase();
FW_ASSERT(opCode >= idBase, opCode, idBase);
FW_ASSERT(opCode >= idBase, static_cast<FwAssertArgType>(opCode), static_cast<FwAssertArgType>(idBase));
}

// ----------------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion compiler/tools/fpp-to-cpp/test/component/base/QueuedGuardedProductsComponentAc.ref.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3172,7 +3172,7 @@ void QueuedGuardedProductsComponentBase ::
FW_ASSERT(callComp);

const U32 idBase = callComp->getIdBase();
FW_ASSERT(opCode >= idBase, opCode, idBase);
FW_ASSERT(opCode >= idBase, static_cast<FwAssertArgType>(opCode), static_cast<FwAssertArgType>(idBase));
}

void QueuedGuardedProductsComponentBase ::
Expand Down
2 changes: 1 addition & 1 deletion compiler/tools/fpp-to-cpp/test/component/base/QueuedParamsComponentAc.ref.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3072,7 +3072,7 @@ void QueuedParamsComponentBase ::
QueuedParamsComponentBase* compPtr = static_cast<QueuedParamsComponentBase*>(callComp);

const U32 idBase = callComp->getIdBase();
FW_ASSERT(opCode >= idBase, opCode, idBase);
FW_ASSERT(opCode >= idBase, static_cast<FwAssertArgType>(opCode), static_cast<FwAssertArgType>(idBase));

// Select base class function based on opcode
switch (opCode - idBase) {
Expand Down
2 changes: 1 addition & 1 deletion compiler/tools/fpp-to-cpp/test/component/base/QueuedSerialComponentAc.ref.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6683,7 +6683,7 @@ void QueuedSerialComponentBase ::
QueuedSerialComponentBase* compPtr = static_cast<QueuedSerialComponentBase*>(callComp);

const U32 idBase = callComp->getIdBase();
FW_ASSERT(opCode >= idBase, opCode, idBase);
FW_ASSERT(opCode >= idBase, static_cast<FwAssertArgType>(opCode), static_cast<FwAssertArgType>(idBase));

// Select base class function based on opcode
switch (opCode - idBase) {
Expand Down
2 changes: 1 addition & 1 deletion compiler/tools/fpp-to-cpp/test/component/base/QueuedSyncProductsComponentAc.ref.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3166,7 +3166,7 @@ void QueuedSyncProductsComponentBase ::
FW_ASSERT(callComp);

const U32 idBase = callComp->getIdBase();
FW_ASSERT(opCode >= idBase, opCode, idBase);
FW_ASSERT(opCode >= idBase, static_cast<FwAssertArgType>(opCode), static_cast<FwAssertArgType>(idBase));
}

void QueuedSyncProductsComponentBase ::
Expand Down
2 changes: 1 addition & 1 deletion compiler/tools/fpp-to-cpp/test/component/base/QueuedTelemetryComponentAc.ref.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3134,7 +3134,7 @@ void QueuedTelemetryComponentBase ::
FW_ASSERT(callComp);

const U32 idBase = callComp->getIdBase();
FW_ASSERT(opCode >= idBase, opCode, idBase);
FW_ASSERT(opCode >= idBase, static_cast<FwAssertArgType>(opCode), static_cast<FwAssertArgType>(idBase));
}

// ----------------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion compiler/tools/fpp-to-cpp/test/component/base/QueuedTestComponentAc.ref.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6499,7 +6499,7 @@ void QueuedTestComponentBase ::
QueuedTestComponentBase* compPtr = static_cast<QueuedTestComponentBase*>(callComp);

const U32 idBase = callComp->getIdBase();
FW_ASSERT(opCode >= idBase, opCode, idBase);
FW_ASSERT(opCode >= idBase, static_cast<FwAssertArgType>(opCode), static_cast<FwAssertArgType>(idBase));

// Select base class function based on opcode
switch (opCode - idBase) {
Expand Down
Loading