Revise topology code gen

Use fully-qualified names for instance defs
nasa · Nov 19, 2024 · 46a2b58 · 46a2b58
1 parent 2753fd4
commit 46a2b58
Show file tree

Hide file tree

Showing 11 changed files with 22 additions and 27 deletions.
diff --git a/compiler/lib/src/main/scala/codegen/CppWriter/TopologyCppWriter/TopologyCppWriterUtils.scala b/compiler/lib/src/main/scala/codegen/CppWriter/TopologyCppWriter/TopologyCppWriterUtils.scala
@@ -52,13 +52,8 @@ abstract class TopologyCppWriterUtils(
   def getComponentNameAsQualIdent(ci: ComponentInstance): String =
     getNameAsQualIdent(getComponentName(ci))
 
-  def getShortName(name: Name.Qualified): Name.Qualified = {
-    val ens = s.a.getEnclosingNames(symbol)
-    name.shortName(ens)
-  }
-
   def getNameAsQualIdent(name: Name.Qualified): String =
-    CppWriter.writeQualifiedName(getShortName(name))
+    CppWriter.writeQualifiedName(name)
 
   def getSpecifierForPhase (phase: Int) (ci: ComponentInstance): 
     Option[InitSpecifier] = ci.initSpecifierMap.get(phase)

diff --git a/compiler/tools/fpp-to-cpp/test/top/BasicTopologyAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/top/BasicTopologyAc.ref.cpp
@@ -12,7 +12,7 @@
 
 namespace M {
 
-  Active active1(FW_OPTIONAL_NAME("active1"));
+  M::Active active1(FW_OPTIONAL_NAME("active1"));
 
 }
 
@@ -23,13 +23,13 @@ namespace M {
 
 namespace M {
 
-  Active active3(FW_OPTIONAL_NAME("active3"));
+  M::Active active3(FW_OPTIONAL_NAME("active3"));
 
 }
 
 namespace M {
 
-  Passive passive1(FW_OPTIONAL_NAME("passive1"));
+  M::Passive passive1(FW_OPTIONAL_NAME("passive1"));
 
 }
 

diff --git a/compiler/tools/fpp-to-cpp/test/top/BasicTopologyAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/top/BasicTopologyAc.ref.hpp
@@ -18,28 +18,28 @@
 namespace M {
 
   //! active1
-  extern Active active1;
+  extern M::Active active1;
 
 }
 
 namespace M {
 
   //! active2
-  extern Active active2;
+  extern M::Active active2;
 
 }
 
 namespace M {
 
   //! active3
-  extern Active active3;
+  extern M::Active active3;
 
 }
 
 namespace M {
 
   //! passive1
-  extern Passive passive1;
+  extern M::Passive passive1;
 
 }
 

diff --git a/compiler/tools/fpp-to-cpp/test/top/CommandsTopologyAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/top/CommandsTopologyAc.ref.cpp
@@ -12,13 +12,13 @@
 
 namespace M {
 
-  C c1(FW_OPTIONAL_NAME("c1"));
+  M::C c1(FW_OPTIONAL_NAME("c1"));
 
 }
 
 namespace M {
 
-  C c2(FW_OPTIONAL_NAME("c2"));
+  M::C c2(FW_OPTIONAL_NAME("c2"));
 
 }
 

diff --git a/compiler/tools/fpp-to-cpp/test/top/CommandsTopologyAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/top/CommandsTopologyAc.ref.hpp
@@ -17,14 +17,14 @@
 namespace M {
 
   //! c1
-  extern C c1;
+  extern M::C c1;
 
 }
 
 namespace M {
 
   //! c2
-  extern C c2;
+  extern M::C c2;
 
 }
 

diff --git a/compiler/tools/fpp-to-cpp/test/top/HealthTopologyAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/top/HealthTopologyAc.ref.cpp
@@ -12,13 +12,13 @@
 
 namespace M {
 
-  C c1(FW_OPTIONAL_NAME("c1"));
+  M::C c1(FW_OPTIONAL_NAME("c1"));
 
 }
 
 namespace M {
 
-  C c2(FW_OPTIONAL_NAME("c2"));
+  M::C c2(FW_OPTIONAL_NAME("c2"));
 
 }
 

diff --git a/compiler/tools/fpp-to-cpp/test/top/HealthTopologyAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/top/HealthTopologyAc.ref.hpp
@@ -18,14 +18,14 @@
 namespace M {
 
   //! c1
-  extern C c1;
+  extern M::C c1;
 
 }
 
 namespace M {
 
   //! c2
-  extern C c2;
+  extern M::C c2;
 
 }
 

diff --git a/compiler/tools/fpp-to-cpp/test/top/NestedNamespacesTopologyAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/top/NestedNamespacesTopologyAc.ref.cpp
@@ -10,7 +10,7 @@
 // Component instances
 // ----------------------------------------------------------------------
 
-N::O::C c(FW_OPTIONAL_NAME("c"));
+M::N::O::C c(FW_OPTIONAL_NAME("c"));
 
 namespace M {
 

diff --git a/compiler/tools/fpp-to-cpp/test/top/NestedNamespacesTopologyAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/top/NestedNamespacesTopologyAc.ref.hpp
@@ -15,7 +15,7 @@
 // ----------------------------------------------------------------------
 
 //! c
-extern N::O::C c;
+extern M::N::O::C c;
 
 namespace M {
 

diff --git a/compiler/tools/fpp-to-cpp/test/top/ParamsTopologyAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/top/ParamsTopologyAc.ref.cpp
@@ -12,13 +12,13 @@
 
 namespace M {
 
-  C c1(FW_OPTIONAL_NAME("c1"));
+  M::C c1(FW_OPTIONAL_NAME("c1"));
 
 }
 
 namespace M {
 
-  C c2(FW_OPTIONAL_NAME("c2"));
+  M::C c2(FW_OPTIONAL_NAME("c2"));
 
 }
 

diff --git a/compiler/tools/fpp-to-cpp/test/top/ParamsTopologyAc.ref.hpp b/compiler/tools/fpp-to-cpp/test/top/ParamsTopologyAc.ref.hpp
@@ -17,14 +17,14 @@
 namespace M {
 
   //! c1
-  extern C c1;
+  extern M::C c1;
 
 }
 
 namespace M {
 
   //! c2
-  extern C c2;
+  extern M::C c2;
 
 }