Merge pull request #760 from jwest115/fix-fpp-to-layout

Use topology qualified name for directory names

Author: bocchino

compiler/lib/src/main/scala/codegen/LayoutWriter/ComputeLayoutFiles.scala

@@ -15,15 +15,10 @@ case class LayoutWriterState(
   locationMap: Map[String, Location] = Map()
 ) {
 
-  /** Gets the unqualified name associated with a symbol. */
+  /** Gets the qualified name associated with a symbol. */
   def getName(symbol: Symbol): String = {
-    val name = symbol.getUnqualifiedName
-    a.parentSymbolMap.get(symbol) match {
-      case Some(cs: Symbol.Component) => s"${cs.getUnqualifiedName}_$name"
-      case _ => name
-    }
+    a.getQualifiedName(symbol).toString.replace(".", "_")
   }
-
 }
 
 case object LayoutWriterState {
@@ -34,4 +29,4 @@ case object LayoutWriterState {
   /** Gets the text filename for a connection graph */
   def getConnectionGraphFileName(baseName: String): String = s"${baseName}.txt"
 
-}
+}

compiler/lib/src/main/scala/codegen/LayoutWriter/LayoutWriterState.scala

@@ -36,10 +36,6 @@ sealed trait Error {
         Error.print (Some(loc)) (s"duplicate JSON file ${file}")
         System.err.println("previous file would be generated here:")
         System.err.println(prevLoc)
-      case CodeGenError.DuplicateLayoutDirectory(dir, loc, prevLoc) =>
-        Error.print (Some(loc)) (s"duplicate topology layout directory ${dir}")
-        System.err.println("previous topology layout directory would be generated here:")
-        System.err.println(prevLoc)
       case CodeGenError.DuplicateXmlFile(file, loc, prevLoc) =>
         Error.print (Some(loc)) (s"duplicate XML file ${file}")
         System.err.println("previous file would be generated here:")
@@ -346,8 +342,6 @@ object CodeGenError {
   final case class DuplicateCppFile(file: String, loc: Location, prevLoc: Location) extends Error
   /** Duplicate JSON file path */
   final case class DuplicateJsonFile(file: String, loc: Location, prevLoc: Location) extends Error
-  /** Duplicate Layout file path */
-  final case class DuplicateLayoutDirectory(dir: String, loc: Location, prevLoc: Location) extends Error
   /** Duplicate XML file path */
   final case class DuplicateXmlFile(file: String, loc: Location, prevLoc: Location) extends Error
   /** Empty struct */

compiler/lib/src/main/scala/util/Error.scala

@@ -38,11 +38,7 @@ object FPPToLayout {
                     case Some(dir1) => dir1
                     case None => "."
                 }
-                ComputeLayoutFiles.visitList(
-                    LayoutWriterState(a=a, dir=dir),
-                    tulFiles, 
-                    ComputeLayoutFiles.transUnit
-                )
+                Right(LayoutWriterState(a, dir))
             }
             _ <- {
                 LayoutWriter.visitList(

compiler/tools/fpp-to-layout/src/main/scala/fpp-to-layout.scala

@@ -0,0 +1,7 @@
+c1
+pOut
+0
+c2
+pIn
+0
+

compiler/tools/fpp-to-layout/test/duplicate_tops/DuplicateLayout.ref/C.txt

@@ -0,0 +1,7 @@
+c1
+pOut
+0
+c2
+pIn
+0
+

compiler/tools/fpp-to-layout/test/duplicate_tops/M_DuplicateLayout.ref/C.txt

@@ -1,8 +1,43 @@
 module M {
 
+  port P
+
+  passive component C1 { 
+
+    output port pOut: P
+
+  }
+
+  passive component C2 { 
+
+    sync input port pIn: P
+
+  }
+
+  instance c1: C1 base id 0x100
+  instance c2: C2 base id 0x200
+
   topology Duplicate { 
+
+    instance c1
+    instance c2
+
+    connections C {
+      c1.pOut -> c2.pIn
+    }
+
   }
+
 }
 
-topology Duplicate { 
+instance c1: M.C1 base id 0x300
+instance c2: M.C2 base id 0x400
+
+topology Duplicate {
+  instance c1
+  instance c2
+
+  connections C {
+    c1.pOut -> c2.pIn
+  }
 }

compiler/tools/fpp-to-layout/test/duplicate_tops/duplicate.fpp

@@ -1,9 +0,0 @@
-fpp-to-layout
-[ local path prefix ]/tools/fpp-to-layout/test/duplicate_tops/duplicate.fpp:7.1
-topology Duplicate { 
-^
-error: duplicate topology layout directory DuplicateLayout
-previous topology layout directory would be generated here:
-[ local path prefix ]/tools/fpp-to-layout/test/duplicate_tops/duplicate.fpp:3.3
-  topology Duplicate { 
-  ^

compiler/tools/fpp-to-layout/test/duplicate_tops/duplicate.ref.txt

@@ -1,5 +1,7 @@
 duplicate()
 {
   run_test '' duplicate && \
+    compare M_Duplicate C && \
+    compare Duplicate C && \
     compare_out duplicate
 }

compiler/tools/fpp-to-layout/test/duplicate_tops/run.sh

@@ -0,0 +1,6 @@
+duplicate()
+{
+  update "" duplicate
+  move_layout_files M_Duplicate C
+  move_layout_files Duplicate C
+}