Skip to content

Fix regression in fpp-filenames and fpp-depend #662

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
merged 1 commit into from
Mar 19, 2025
Merged

Fix regression in fpp-filenames and fpp-depend #662

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 0 additions & 5 deletions compiler/lib/src/main/scala/codegen/ComputeGeneratedFiles.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
11 changes: 1 addition & 10 deletions compiler/lib/src/main/scala/codegen/CppWriter/ComputeAutocodeCppFiles.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
2 changes: 0 additions & 2 deletions compiler/tools/fpp-depend/test/filenames_auto_generated_output.ref.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,6 @@ TTopologyAppAi.xml
TTopologyDictionary.json
T_PTlmPacketsAc.cpp
T_PTlmPacketsAc.hpp
WithCDefinitionAliasAc.h
WithCDefinitionAliasAc.hpp
WithCDefinitionBuiltinAliasAc.h
WithCDefinitionBuiltinAliasAc.hpp
WithoutCDefinitionAliasAc.hpp
2 changes: 0 additions & 2 deletions compiler/tools/fpp-depend/test/filenames_generated_output.ref.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,6 @@ TTopologyAppAi.xml
TTopologyDictionary.json
T_PTlmPacketsAc.cpp
T_PTlmPacketsAc.hpp
WithCDefinitionAliasAc.h
WithCDefinitionAliasAc.hpp
WithCDefinitionBuiltinAliasAc.h
WithCDefinitionBuiltinAliasAc.hpp
WithoutCDefinitionAliasAc.hpp
2 changes: 0 additions & 2 deletions compiler/tools/fpp-depend/test/filenames_include_auto_generated_output.ref.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,6 @@ TTopologyAppAi.xml
TTopologyDictionary.json
T_PTlmPacketsAc.cpp
T_PTlmPacketsAc.hpp
WithCDefinitionAliasAc.h
WithCDefinitionAliasAc.hpp
WithCDefinitionBuiltinAliasAc.h
WithCDefinitionBuiltinAliasAc.hpp
WithoutCDefinitionAliasAc.hpp
2 changes: 0 additions & 2 deletions compiler/tools/fpp-depend/test/filenames_include_generated_output.ref.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,6 @@ TTopologyAppAi.xml
TTopologyDictionary.json
T_PTlmPacketsAc.cpp
T_PTlmPacketsAc.hpp
WithCDefinitionAliasAc.h
WithCDefinitionAliasAc.hpp
WithCDefinitionBuiltinAliasAc.h
WithCDefinitionBuiltinAliasAc.hpp
WithoutCDefinitionAliasAc.hpp
2 changes: 0 additions & 2 deletions compiler/tools/fpp-filenames/test/include.ref.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,6 @@ TTopologyAppAi.xml
TTopologyDictionary.json
T_PTlmPacketsAc.cpp
T_PTlmPacketsAc.hpp
WithCDefinitionAliasAc.h
WithCDefinitionAliasAc.hpp
WithCDefinitionBuiltinAliasAc.h
WithCDefinitionBuiltinAliasAc.hpp
WithoutCDefinitionAliasAc.hpp
2 changes: 0 additions & 2 deletions compiler/tools/fpp-filenames/test/ok.ref.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,6 @@ TTopologyAppAi.xml
TTopologyDictionary.json
T_PTlmPacketsAc.cpp
T_PTlmPacketsAc.hpp
WithCDefinitionAliasAc.h
WithCDefinitionAliasAc.hpp
WithCDefinitionBuiltinAliasAc.h
WithCDefinitionBuiltinAliasAc.hpp
WithoutCDefinitionAliasAc.hpp