Fix and cpp-check

nasa · Nov 13, 2024 · dba95ff · dba95ff
1 parent 9ee692a
commit dba95ff
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 13 deletions.
diff --git a/...iler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentStateMachines.scala b/...iler/lib/src/main/scala/codegen/CppWriter/ComponentCppWriter/ComponentStateMachines.scala
@@ -205,11 +205,12 @@ case class ComponentStateMachines(
 
       val smiName = smi.getName
       val smName = s.writeSymbol(smi.symbol)
+      val smEnumName = s"$smName::${s.getName(smi.symbol)}_States";
       functionClassMember( 
         Some(s"Get the state of state machine instance $smiName"), 
         s"${smiName}_getState",
         Nil, 
-        CppDoc.Type(s"$smName::State", Some(s"$name::$smName::State")), 
+        CppDoc.Type(smEnumName, Some(smEnumName)), 
         lines(s"return this->m_stateMachine_$smiName.state;"), 
         CppDoc.Function.NonSV, 
         CppDoc.Function.Const 

diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveStateMachinesComponentAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveStateMachinesComponentAc.ref.cpp
@@ -446,37 +446,37 @@ namespace M {
   // State getter functions
   // ----------------------------------------------------------------------
 
-  ActiveStateMachines::M::ActiveStateMachines_S1::State ActiveStateMachinesComponentBase ::
+  M::ActiveStateMachines_S1::ActiveStateMachines_S1_States ActiveStateMachinesComponentBase ::
     sm1_getState() const
   {
     return this->m_stateMachine_sm1.state;
   }
 
-  ActiveStateMachines::M::ActiveStateMachines_S1::State ActiveStateMachinesComponentBase ::
+  M::ActiveStateMachines_S1::ActiveStateMachines_S1_States ActiveStateMachinesComponentBase ::
     sm2_getState() const
   {
     return this->m_stateMachine_sm2.state;
   }
 
-  ActiveStateMachines::M::ActiveStateMachines_S2::State ActiveStateMachinesComponentBase ::
+  M::ActiveStateMachines_S2::ActiveStateMachines_S2_States ActiveStateMachinesComponentBase ::
     sm3_getState() const
   {
     return this->m_stateMachine_sm3.state;
   }
 
-  ActiveStateMachines::M::ActiveStateMachines_S2::State ActiveStateMachinesComponentBase ::
+  M::ActiveStateMachines_S2::ActiveStateMachines_S2_States ActiveStateMachinesComponentBase ::
     sm4_getState() const
   {
     return this->m_stateMachine_sm4.state;
   }
 
-  ActiveStateMachines::M::ActiveStateMachines_S2::State ActiveStateMachinesComponentBase ::
+  M::ActiveStateMachines_S2::ActiveStateMachines_S2_States ActiveStateMachinesComponentBase ::
     sm5_getState() const
   {
     return this->m_stateMachine_sm5.state;
   }
 
-  ActiveStateMachines::M::ActiveStateMachines_S2::State ActiveStateMachinesComponentBase ::
+  M::ActiveStateMachines_S2::ActiveStateMachines_S2_States ActiveStateMachinesComponentBase ::
     sm6_getState() const
   {
     return this->m_stateMachine_sm6.state;

diff --git a/compiler/tools/fpp-to-cpp/test/component/base/ActiveStateMachinesComponentAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/component/base/ActiveStateMachinesComponentAc.ref.hpp
@@ -138,22 +138,22 @@ namespace M {
       // ----------------------------------------------------------------------
 
       //! Get the state of state machine instance sm1
-      M::ActiveStateMachines_S1::State sm1_getState() const;
+      M::ActiveStateMachines_S1::ActiveStateMachines_S1_States sm1_getState() const;
 
       //! Get the state of state machine instance sm2
-      M::ActiveStateMachines_S1::State sm2_getState() const;
+      M::ActiveStateMachines_S1::ActiveStateMachines_S1_States sm2_getState() const;
 
       //! Get the state of state machine instance sm3
-      M::ActiveStateMachines_S2::State sm3_getState() const;
+      M::ActiveStateMachines_S2::ActiveStateMachines_S2_States sm3_getState() const;
 
       //! Get the state of state machine instance sm4
-      M::ActiveStateMachines_S2::State sm4_getState() const;
+      M::ActiveStateMachines_S2::ActiveStateMachines_S2_States sm4_getState() const;
 
       //! Get the state of state machine instance sm5
-      M::ActiveStateMachines_S2::State sm5_getState() const;
+      M::ActiveStateMachines_S2::ActiveStateMachines_S2_States sm5_getState() const;
 
       //! Get the state of state machine instance sm6
-      M::ActiveStateMachines_S2::State sm6_getState() const;
+      M::ActiveStateMachines_S2::ActiveStateMachines_S2_States sm6_getState() const;
 
     PRIVATE: