Skip to content

Fix string alias codegen #676

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

Merged
bocchino merged 4 commits into from
Apr 11, 2025
Merged

Fix string alias codegen #676

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
08a95ff
Fix string alias codegen
Kronos3 Apr 10, 2025
489ecb5
Reduce array size
Kronos3 Apr 10, 2025
d2caa67
Use Fw::String instead of alias name
Kronos3 Apr 10, 2025
6d345b4
Add note about string names
Kronos3 Apr 10, 2025
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
9 changes: 7 additions & 2 deletions compiler/lib/src/main/scala/codegen/CppWriter/TypeCppWriter.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,13 @@ case class TypeCppWriter(
s.writeSymbol(Symbol.AbsType(t.node))

override def aliasType(s: CppWriterState, t: Type.AliasType) =
(stringTypeName, t.getUnderlyingType) match {
case ("Fw::StringBase", Type.String(_)) => stringTypeName
t.getUnderlyingType match {
// String aliases are represented as `Fw::String` in C++ code
// Because string types in code generated by FPP depends on the
// context in the which the string appears, aliases will maintain
// the same behavior as their underlying string types wherever used in
// the FPP model.
case Type.String(_) => stringTypeName
Comment thread
Kronos3 marked this conversation as resolved.
case _ => s.writeSymbol(Symbol.AliasType(t.node))
}

Expand Down
4 changes: 2 additions & 2 deletions compiler/tools/fpp-to-cpp/test/alias/BasicSerializableAc.ref.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ class Basic :
SERIALIZED_SIZE =
sizeof(TU32) +
sizeof(TF32) +
TString::SERIALIZED_SIZE +
TStringSize::SERIALIZED_SIZE
Fw::StringBase::STATIC_SERIALIZED_SIZE(80) +
Fw::StringBase::STATIC_SERIALIZED_SIZE(2)
};

public:
Expand Down
14 changes: 7 additions & 7 deletions 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 @@ -2526,7 +2526,7 @@ void ActiveAsyncProductsComponentBase ::
);
}

AliasString ActiveAsyncProductsComponentBase ::
Fw::String ActiveAsyncProductsComponentBase ::
noArgsAliasStringReturnSync_handlerBase(FwIndexType portNum)
{
// Make sure port number is valid
Expand All @@ -2535,7 +2535,7 @@ AliasString ActiveAsyncProductsComponentBase ::
static_cast<FwAssertArgType>(portNum)
);

AliasString retVal;
Fw::String retVal;

// Call handler function
retVal = this->noArgsAliasStringReturnSync_handler(portNum);
Expand Down Expand Up @@ -2744,7 +2744,7 @@ AliasPrim2 ActiveAsyncProductsComponentBase ::
return retVal;
}

AliasString ActiveAsyncProductsComponentBase ::
Fw::String ActiveAsyncProductsComponentBase ::
typedAliasStringReturnSync_handlerBase(
FwIndexType portNum,
AliasPrim1 u32,
Expand All @@ -2762,7 +2762,7 @@ AliasString ActiveAsyncProductsComponentBase ::
static_cast<FwAssertArgType>(portNum)
);

AliasString retVal;
Fw::String retVal;

// Call handler function
retVal = this->typedAliasStringReturnSync_handler(
Expand Down Expand Up @@ -3625,7 +3625,7 @@ AliasPrim2 ActiveAsyncProductsComponentBase ::
);
}

AliasString ActiveAsyncProductsComponentBase ::
Fw::String ActiveAsyncProductsComponentBase ::
typedAliasReturnStringOut_out(
FwIndexType portNum,
AliasPrim1 u32,
Expand Down Expand Up @@ -4318,7 +4318,7 @@ void ActiveAsyncProductsComponentBase ::
);
}

AliasString ActiveAsyncProductsComponentBase ::
Fw::String ActiveAsyncProductsComponentBase ::
m_p_noArgsAliasStringReturnSync_in(
Fw::PassiveComponentBase* callComp,
FwIndexType portNum
Expand Down Expand Up @@ -4449,7 +4449,7 @@ AliasPrim2 ActiveAsyncProductsComponentBase ::
);
}

AliasString ActiveAsyncProductsComponentBase ::
Fw::String ActiveAsyncProductsComponentBase ::
m_p_typedAliasStringReturnSync_in(
Fw::PassiveComponentBase* callComp,
FwIndexType portNum,
Expand Down
14 changes: 7 additions & 7 deletions compiler/tools/fpp-to-cpp/test/component/base/ActiveAsyncProductsComponentAc.ref.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1058,7 +1058,7 @@ class ActiveAsyncProductsComponentBase :
) = 0;

//! Handler for input port noArgsAliasStringReturnSync
virtual AliasString noArgsAliasStringReturnSync_handler(
virtual Fw::String noArgsAliasStringReturnSync_handler(
FwIndexType portNum //!< The port number
) = 0;

Expand Down Expand Up @@ -1117,7 +1117,7 @@ class ActiveAsyncProductsComponentBase :
) = 0;

//! Handler for input port typedAliasStringReturnSync
virtual AliasString typedAliasStringReturnSync_handler(
virtual Fw::String typedAliasStringReturnSync_handler(
FwIndexType portNum, //!< The port number
AliasPrim1 u32, //!< A primitive
AliasPrim2 f32, //!< Another primtive
Expand Down Expand Up @@ -1245,7 +1245,7 @@ class ActiveAsyncProductsComponentBase :
);

//! Handler base-class function for input port noArgsAliasStringReturnSync
AliasString noArgsAliasStringReturnSync_handlerBase(
Fw::String noArgsAliasStringReturnSync_handlerBase(
FwIndexType portNum //!< The port number
);

Expand Down Expand Up @@ -1304,7 +1304,7 @@ class ActiveAsyncProductsComponentBase :
);

//! Handler base-class function for input port typedAliasStringReturnSync
AliasString typedAliasStringReturnSync_handlerBase(
Fw::String typedAliasStringReturnSync_handlerBase(
FwIndexType portNum, //!< The port number
AliasPrim1 u32, //!< A primitive
AliasPrim2 f32, //!< Another primtive
Expand Down Expand Up @@ -1570,7 +1570,7 @@ class ActiveAsyncProductsComponentBase :
);

//! Invoke output port typedAliasReturnStringOut
AliasString typedAliasReturnStringOut_out(
Fw::String typedAliasReturnStringOut_out(
FwIndexType portNum, //!< The port number
AliasPrim1 u32, //!< A primitive
AliasPrim2 f32, //!< Another primtive
Expand Down Expand Up @@ -1767,7 +1767,7 @@ class ActiveAsyncProductsComponentBase :
);

//! Callback for port noArgsAliasStringReturnSync
static AliasString m_p_noArgsAliasStringReturnSync_in(
static Fw::String m_p_noArgsAliasStringReturnSync_in(
Fw::PassiveComponentBase* callComp, //!< The component instance
FwIndexType portNum //!< The port number
);
Expand Down Expand Up @@ -1835,7 +1835,7 @@ class ActiveAsyncProductsComponentBase :
);

//! Callback for port typedAliasStringReturnSync
static AliasString m_p_typedAliasStringReturnSync_in(
static Fw::String m_p_typedAliasStringReturnSync_in(
Fw::PassiveComponentBase* callComp, //!< The component instance
FwIndexType portNum, //!< The port number
AliasPrim1 u32, //!< A primitive
Expand Down
14 changes: 7 additions & 7 deletions 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 @@ -2140,7 +2140,7 @@ void ActiveCommandsComponentBase ::
);
}

AliasString ActiveCommandsComponentBase ::
Fw::String ActiveCommandsComponentBase ::
noArgsAliasStringReturnSync_handlerBase(FwIndexType portNum)
{
// Make sure port number is valid
Expand All @@ -2149,7 +2149,7 @@ AliasString ActiveCommandsComponentBase ::
static_cast<FwAssertArgType>(portNum)
);

AliasString retVal;
Fw::String retVal;

// Call handler function
retVal = this->noArgsAliasStringReturnSync_handler(portNum);
Expand Down Expand Up @@ -2358,7 +2358,7 @@ AliasPrim2 ActiveCommandsComponentBase ::
return retVal;
}

AliasString ActiveCommandsComponentBase ::
Fw::String ActiveCommandsComponentBase ::
typedAliasStringReturnSync_handlerBase(
FwIndexType portNum,
AliasPrim1 u32,
Expand All @@ -2376,7 +2376,7 @@ AliasString ActiveCommandsComponentBase ::
static_cast<FwAssertArgType>(portNum)
);

AliasString retVal;
Fw::String retVal;

// Call handler function
retVal = this->typedAliasStringReturnSync_handler(
Expand Down Expand Up @@ -3172,7 +3172,7 @@ AliasPrim2 ActiveCommandsComponentBase ::
);
}

AliasString ActiveCommandsComponentBase ::
Fw::String ActiveCommandsComponentBase ::
typedAliasReturnStringOut_out(
FwIndexType portNum,
AliasPrim1 u32,
Expand Down Expand Up @@ -5223,7 +5223,7 @@ void ActiveCommandsComponentBase ::
);
}

AliasString ActiveCommandsComponentBase ::
Fw::String ActiveCommandsComponentBase ::
m_p_noArgsAliasStringReturnSync_in(
Fw::PassiveComponentBase* callComp,
FwIndexType portNum
Expand Down Expand Up @@ -5354,7 +5354,7 @@ AliasPrim2 ActiveCommandsComponentBase ::
);
}

AliasString ActiveCommandsComponentBase ::
Fw::String ActiveCommandsComponentBase ::
m_p_typedAliasStringReturnSync_in(
Fw::PassiveComponentBase* callComp,
FwIndexType portNum,
Expand Down
14 changes: 7 additions & 7 deletions compiler/tools/fpp-to-cpp/test/component/base/ActiveCommandsComponentAc.ref.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -873,7 +873,7 @@ class ActiveCommandsComponentBase :
) = 0;

//! Handler for input port noArgsAliasStringReturnSync
virtual AliasString noArgsAliasStringReturnSync_handler(
virtual Fw::String noArgsAliasStringReturnSync_handler(
FwIndexType portNum //!< The port number
) = 0;

Expand Down Expand Up @@ -932,7 +932,7 @@ class ActiveCommandsComponentBase :
) = 0;

//! Handler for input port typedAliasStringReturnSync
virtual AliasString typedAliasStringReturnSync_handler(
virtual Fw::String typedAliasStringReturnSync_handler(
FwIndexType portNum, //!< The port number
AliasPrim1 u32, //!< A primitive
AliasPrim2 f32, //!< Another primtive
Expand Down Expand Up @@ -1060,7 +1060,7 @@ class ActiveCommandsComponentBase :
);

//! Handler base-class function for input port noArgsAliasStringReturnSync
AliasString noArgsAliasStringReturnSync_handlerBase(
Fw::String noArgsAliasStringReturnSync_handlerBase(
FwIndexType portNum //!< The port number
);

Expand Down Expand Up @@ -1119,7 +1119,7 @@ class ActiveCommandsComponentBase :
);

//! Handler base-class function for input port typedAliasStringReturnSync
AliasString typedAliasStringReturnSync_handlerBase(
Fw::String typedAliasStringReturnSync_handlerBase(
FwIndexType portNum, //!< The port number
AliasPrim1 u32, //!< A primitive
AliasPrim2 f32, //!< Another primtive
Expand Down Expand Up @@ -1347,7 +1347,7 @@ class ActiveCommandsComponentBase :
);

//! Invoke output port typedAliasReturnStringOut
AliasString typedAliasReturnStringOut_out(
Fw::String typedAliasReturnStringOut_out(
FwIndexType portNum, //!< The port number
AliasPrim1 u32, //!< A primitive
AliasPrim2 f32, //!< Another primtive
Expand Down Expand Up @@ -1826,7 +1826,7 @@ class ActiveCommandsComponentBase :
);

//! Callback for port noArgsAliasStringReturnSync
static AliasString m_p_noArgsAliasStringReturnSync_in(
static Fw::String m_p_noArgsAliasStringReturnSync_in(
Fw::PassiveComponentBase* callComp, //!< The component instance
FwIndexType portNum //!< The port number
);
Expand Down Expand Up @@ -1894,7 +1894,7 @@ class ActiveCommandsComponentBase :
);

//! Callback for port typedAliasStringReturnSync
static AliasString m_p_typedAliasStringReturnSync_in(
static Fw::String m_p_typedAliasStringReturnSync_in(
Fw::PassiveComponentBase* callComp, //!< The component instance
FwIndexType portNum, //!< The port number
AliasPrim1 u32, //!< A primitive
Expand Down
14 changes: 7 additions & 7 deletions 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 @@ -2059,7 +2059,7 @@ void ActiveEventsComponentBase ::
);
}

AliasString ActiveEventsComponentBase ::
Fw::String ActiveEventsComponentBase ::
noArgsAliasStringReturnSync_handlerBase(FwIndexType portNum)
{
// Make sure port number is valid
Expand All @@ -2068,7 +2068,7 @@ AliasString ActiveEventsComponentBase ::
static_cast<FwAssertArgType>(portNum)
);

AliasString retVal;
Fw::String retVal;

// Call handler function
retVal = this->noArgsAliasStringReturnSync_handler(portNum);
Expand Down Expand Up @@ -2277,7 +2277,7 @@ AliasPrim2 ActiveEventsComponentBase ::
return retVal;
}

AliasString ActiveEventsComponentBase ::
Fw::String ActiveEventsComponentBase ::
typedAliasStringReturnSync_handlerBase(
FwIndexType portNum,
AliasPrim1 u32,
Expand All @@ -2295,7 +2295,7 @@ AliasString ActiveEventsComponentBase ::
static_cast<FwAssertArgType>(portNum)
);

AliasString retVal;
Fw::String retVal;

// Call handler function
retVal = this->typedAliasStringReturnSync_handler(
Expand Down Expand Up @@ -3091,7 +3091,7 @@ AliasPrim2 ActiveEventsComponentBase ::
);
}

AliasString ActiveEventsComponentBase ::
Fw::String ActiveEventsComponentBase ::
typedAliasReturnStringOut_out(
FwIndexType portNum,
AliasPrim1 u32,
Expand Down Expand Up @@ -4350,7 +4350,7 @@ void ActiveEventsComponentBase ::
);
}

AliasString ActiveEventsComponentBase ::
Fw::String ActiveEventsComponentBase ::
m_p_noArgsAliasStringReturnSync_in(
Fw::PassiveComponentBase* callComp,
FwIndexType portNum
Expand Down Expand Up @@ -4481,7 +4481,7 @@ AliasPrim2 ActiveEventsComponentBase ::
);
}

AliasString ActiveEventsComponentBase ::
Fw::String ActiveEventsComponentBase ::
m_p_typedAliasStringReturnSync_in(
Fw::PassiveComponentBase* callComp,
FwIndexType portNum,
Expand Down
Loading