Merge pull request #662 from nasa/fix-fpp-filenames

Fix regression in fpp-filenames and fpp-depend

Author: bocchino

compiler/lib/src/main/scala/codegen/ComputeGeneratedFiles.scala

@@ -10,12 +10,7 @@ object ComputeGeneratedFiles {
   /** Computes autocoded files (XML, C++ and JSON Dictionary) */
   def getAutocodeFiles(tul: List[Ast.TransUnit]): Result.Result[List[String]] =
     for {
-      // Perform analysis only up to the point we need
       a <- enterSymbols(tul)
-      a <- CheckUses.visitList(a, tul, CheckUses.transUnit)
-      _ <- CheckUseDefCycles.visitList(a, tul, CheckUseDefCycles.transUnit)
-      a <- CheckTypeUses.visitList(a, tul, CheckTypeUses.transUnit)
-
       xmlFiles <- getXmlFiles(a, tul)
       cppFiles <- getAutocodeCppFiles(a, tul)
       dictFiles <- getDictionaryJsonFiles(a, tul)

compiler/lib/src/main/scala/codegen/CppWriter/ComputeAutocodeCppFiles.scala

@@ -34,16 +34,7 @@ object ComputeAutocodeCppFiles extends ComputeCppFiles {
     val name = s.getName(Symbol.AliasType(aNode))
     val loc = Locations.get(node.id)
     val fileName = ComputeCppFiles.FileNames.getAliasType(name)
-    val t = s.a.typeMap(node.id)
-
-    for {
-      s <- addHppMapping(s, fileName, Some(loc), "hpp")
-      // Only add C header if its supported
-      s <- s.isTypeSupportedInC(t) match {
-        case true => addHppMapping(s, fileName, Some(loc), "h")
-        case false => Right(s)
-      }
-    } yield s
+    addHppMapping(s, fileName, Some(loc), "hpp")
   }
 
   override def defArrayAnnotatedNode(

compiler/tools/fpp-depend/test/filenames_auto_generated_output.ref.txt

@@ -32,8 +32,6 @@ TTopologyAppAi.xml
 TTopologyDictionary.json
 T_PTlmPacketsAc.cpp
 T_PTlmPacketsAc.hpp
-WithCDefinitionAliasAc.h
 WithCDefinitionAliasAc.hpp
-WithCDefinitionBuiltinAliasAc.h
 WithCDefinitionBuiltinAliasAc.hpp
 WithoutCDefinitionAliasAc.hpp

compiler/tools/fpp-depend/test/filenames_generated_output.ref.txt

@@ -32,8 +32,6 @@ TTopologyAppAi.xml
 TTopologyDictionary.json
 T_PTlmPacketsAc.cpp
 T_PTlmPacketsAc.hpp
-WithCDefinitionAliasAc.h
 WithCDefinitionAliasAc.hpp
-WithCDefinitionBuiltinAliasAc.h
 WithCDefinitionBuiltinAliasAc.hpp
 WithoutCDefinitionAliasAc.hpp

compiler/tools/fpp-depend/test/filenames_include_auto_generated_output.ref.txt

@@ -32,8 +32,6 @@ TTopologyAppAi.xml
 TTopologyDictionary.json
 T_PTlmPacketsAc.cpp
 T_PTlmPacketsAc.hpp
-WithCDefinitionAliasAc.h
 WithCDefinitionAliasAc.hpp
-WithCDefinitionBuiltinAliasAc.h
 WithCDefinitionBuiltinAliasAc.hpp
 WithoutCDefinitionAliasAc.hpp

compiler/tools/fpp-depend/test/filenames_include_generated_output.ref.txt

@@ -32,8 +32,6 @@ TTopologyAppAi.xml
 TTopologyDictionary.json
 T_PTlmPacketsAc.cpp
 T_PTlmPacketsAc.hpp
-WithCDefinitionAliasAc.h
 WithCDefinitionAliasAc.hpp
-WithCDefinitionBuiltinAliasAc.h
 WithCDefinitionBuiltinAliasAc.hpp
 WithoutCDefinitionAliasAc.hpp

compiler/tools/fpp-filenames/test/include.ref.txt

@@ -32,8 +32,6 @@ TTopologyAppAi.xml
 TTopologyDictionary.json
 T_PTlmPacketsAc.cpp
 T_PTlmPacketsAc.hpp
-WithCDefinitionAliasAc.h
 WithCDefinitionAliasAc.hpp
-WithCDefinitionBuiltinAliasAc.h
 WithCDefinitionBuiltinAliasAc.hpp
 WithoutCDefinitionAliasAc.hpp

compiler/tools/fpp-filenames/test/ok.ref.txt

@@ -32,8 +32,6 @@ TTopologyAppAi.xml
 TTopologyDictionary.json
 T_PTlmPacketsAc.cpp
 T_PTlmPacketsAc.hpp
-WithCDefinitionAliasAc.h
 WithCDefinitionAliasAc.hpp
-WithCDefinitionBuiltinAliasAc.h
 WithCDefinitionBuiltinAliasAc.hpp
 WithoutCDefinitionAliasAc.hpp