Merge pull request #4013 from hzeller/feature-20241110-more-inc-fixes

Various include fixes...
chipsalliance · Nov 11, 2024 · 67182c7 · 67182c7
2 parents da88163 + fc50a33
commit 67182c7
Show file tree

Hide file tree

Showing 97 changed files with 243 additions and 0 deletions.
diff --git a/include/Surelog/Cache/PPCache.h b/include/Surelog/Cache/PPCache.h
@@ -27,6 +27,7 @@
 
 #include <Surelog/Cache/Cache.h>
 #include <Surelog/Cache/PPCache.capnp.h>
+#include <Surelog/Common/PathId.h>
 
 #include <cstdint>
 

diff --git a/include/Surelog/Cache/ParseCache.h b/include/Surelog/Cache/ParseCache.h
@@ -27,6 +27,7 @@
 
 #include <Surelog/Cache/Cache.h>
 #include <Surelog/Cache/ParseCache.capnp.h>
+#include <Surelog/Common/PathId.h>
 
 namespace SURELOG {
 

diff --git a/include/Surelog/Cache/PythonAPICache.h b/include/Surelog/Cache/PythonAPICache.h
@@ -27,6 +27,7 @@
 
 #include <Surelog/Cache/Cache.h>
 #include <Surelog/Cache/PythonAPICache.capnp.h>
+#include <Surelog/Common/PathId.h>
 
 namespace SURELOG {
 

diff --git a/include/Surelog/Common/FileSystem.h b/include/Surelog/Common/FileSystem.h
@@ -26,6 +26,7 @@
 #pragma once
 
 #include <Surelog/Common/PathId.h>
+#include <Surelog/Common/SymbolId.h>
 
 #include <cstdint>
 #include <filesystem>

diff --git a/include/Surelog/Common/NodeId.h b/include/Surelog/Common/NodeId.h
@@ -18,6 +18,7 @@
 #define SURELOG_NODEID_H
 #pragma once
 
+#include <cstddef>
 #include <cstdint>
 #include <ostream>
 #include <set>

diff --git a/include/Surelog/Common/PathId.h b/include/Surelog/Common/PathId.h
@@ -20,6 +20,7 @@
 
 #include <Surelog/Common/SymbolId.h>
 
+#include <cstddef>
 #include <cstdint>
 #include <istream>
 #include <set>

diff --git a/include/Surelog/Common/PlatformFileSystem.h b/include/Surelog/Common/PlatformFileSystem.h
@@ -26,6 +26,8 @@
 #pragma once
 
 #include <Surelog/Common/FileSystem.h>
+#include <Surelog/Common/PathId.h>
+#include <Surelog/Common/SymbolId.h>
 
 #include <cstdint>
 #include <functional>

diff --git a/include/Surelog/Design/FileContent.h b/include/Surelog/Design/FileContent.h
@@ -27,9 +27,12 @@
 
 #include <Surelog/Common/Containers.h>
 #include <Surelog/Common/NodeId.h>
+#include <Surelog/Common/PathId.h>
+#include <Surelog/Common/SymbolId.h>
 #include <Surelog/Design/DesignComponent.h>
 #include <Surelog/Design/VObject.h>
 #include <Surelog/SourceCompile/VObjectTypes.h>
+#include <uhdm/uhdm_types.h>
 
 #include <cstdint>
 #include <functional>

diff --git a/include/Surelog/Design/ModuleInstance.h b/include/Surelog/Design/ModuleInstance.h
@@ -31,6 +31,7 @@
 #include <Surelog/Design/ValuedComponentI.h>
 #include <Surelog/SourceCompile/VObjectTypes.h>
 #include <uhdm/Serializer.h>
+#include <uhdm/expr.h>
 
 #include <cstdint>
 #include <map>

diff --git a/include/Surelog/DesignCompile/CompileDesign.h b/include/Surelog/DesignCompile/CompileDesign.h
@@ -25,6 +25,7 @@
 #define SURELOG_COMPILEDESIGN_H
 #pragma once
 
+#include <Surelog/Common/PathId.h>
 #include <Surelog/Design/Design.h>
 
 #include <cstdint>

diff --git a/include/Surelog/DesignCompile/CompileHelper.h b/include/Surelog/DesignCompile/CompileHelper.h
@@ -29,6 +29,8 @@
 #include <Surelog/Design/ValuedComponentI.h>
 #include <Surelog/Expression/ExprBuilder.h>
 #include <Surelog/SourceCompile/VObjectTypes.h>
+#include <uhdm/expr.h>
+#include <uhdm/uhdm_types.h>
 
 #include <cstdint>
 #include <string>

diff --git a/include/Surelog/DesignCompile/NetlistElaboration.h b/include/Surelog/DesignCompile/NetlistElaboration.h
@@ -26,7 +26,9 @@
 #pragma once
 
 #include <Surelog/Common/NodeId.h>
+#include <Surelog/Common/PathId.h>
 #include <Surelog/DesignCompile/TestbenchElaboration.h>
+#include <uhdm/uhdm_types.h>
 
 #include <cstdint>
 #include <map>

diff --git a/include/Surelog/DesignCompile/UhdmWriter.h b/include/Surelog/DesignCompile/UhdmWriter.h
@@ -25,6 +25,7 @@
 #define SURELOG_UHDMWRITER_H
 #pragma once
 
+#include <Surelog/Common/PathId.h>
 #include <Surelog/Design/DesignComponent.h>
 #include <Surelog/DesignCompile/CompileHelper.h>
 #include <Surelog/SourceCompile/VObjectTypes.h>

diff --git a/include/Surelog/Library/Library.h b/include/Surelog/Library/Library.h
@@ -26,6 +26,7 @@
 #pragma once
 
 #include <Surelog/Common/PathId.h>
+#include <Surelog/Common/SymbolId.h>
 
 #include <map>
 #include <ostream>

diff --git a/include/Surelog/Library/SVLibShapeListener.h b/include/Surelog/Library/SVLibShapeListener.h
@@ -26,6 +26,7 @@
 #pragma once
 
 #include <Surelog/Common/PathId.h>
+#include <Surelog/Common/SymbolId.h>
 #include <Surelog/SourceCompile/SV3_1aTreeShapeHelper.h>
 #include <Surelog/SourceCompile/VObjectTypes.h>
 #include <parser/SV3_1aParserBaseListener.h>

diff --git a/include/Surelog/SourceCompile/AntlrParserErrorListener.h b/include/Surelog/SourceCompile/AntlrParserErrorListener.h
@@ -28,6 +28,7 @@
 #include <ANTLRErrorListener.h>
 #include <Surelog/Common/PathId.h>
 
+#include <cstddef>
 #include <cstdint>
 #include <string>
 #include <vector>

diff --git a/include/Surelog/SourceCompile/CommonListenerHelper.h b/include/Surelog/SourceCompile/CommonListenerHelper.h
@@ -27,6 +27,7 @@
 
 #include <Surelog/Common/NodeId.h>
 #include <Surelog/Common/PathId.h>
+#include <Surelog/Common/SymbolId.h>
 #include <Surelog/SourceCompile/VObjectTypes.h>
 
 #include <cstdint>

diff --git a/include/Surelog/SourceCompile/CompilationUnit.h b/include/Surelog/SourceCompile/CompilationUnit.h
@@ -27,6 +27,7 @@
 
 #include <Surelog/Common/Containers.h>
 #include <Surelog/Common/NodeId.h>
+#include <Surelog/Common/PathId.h>
 #include <Surelog/Design/TimeInfo.h>
 #include <Surelog/SourceCompile/VObjectTypes.h>
 

diff --git a/include/Surelog/SourceCompile/CompileSourceFile.h b/include/Surelog/SourceCompile/CompileSourceFile.h
@@ -25,6 +25,7 @@
 #define SURELOG_COMPILESOURCEFILE_H
 #pragma once
 
+#include <Surelog/Common/PathId.h>
 #include <Surelog/Common/SymbolId.h>
 #include <Surelog/SourceCompile/PreprocessFile.h>
 

diff --git a/include/Surelog/SourceCompile/ParseFile.h b/include/Surelog/SourceCompile/ParseFile.h
@@ -25,6 +25,8 @@
 #define SURELOG_PARSEFILE_H
 #pragma once
 
+#include <Surelog/Common/PathId.h>
+#include <Surelog/Common/SymbolId.h>
 #include <Surelog/ErrorReporting/Error.h>
 
 #include <cstdint>

diff --git a/include/Surelog/SourceCompile/PreprocessFile.h b/include/Surelog/SourceCompile/PreprocessFile.h
@@ -31,6 +31,7 @@
 #include <Surelog/SourceCompile/IncludeFileInfo.h>
 #include <Surelog/SourceCompile/LoopCheck.h>
 
+#include <cstddef>
 #include <cstdint>
 #include <set>
 #include <string>

diff --git a/include/Surelog/SourceCompile/PythonListen.h b/include/Surelog/SourceCompile/PythonListen.h
@@ -27,6 +27,7 @@
 
 #ifdef SURELOG_WITH_PYTHON
 
+#include <Surelog/ErrorReporting/Error.h>
 #include <Surelog/SourceCompile/CompileSourceFile.h>
 #include <Surelog/SourceCompile/ParseFile.h>
 

diff --git a/include/Surelog/SourceCompile/SV3_1aPpTreeListenerHelper.h b/include/Surelog/SourceCompile/SV3_1aPpTreeListenerHelper.h
@@ -25,6 +25,7 @@
 #define SURELOG_SV3_1APPTREELISTENERHELPER_H
 #pragma once
 
+#include <Surelog/Common/PathId.h>
 #include <Surelog/Common/SymbolId.h>
 #include <Surelog/ErrorReporting/ErrorDefinition.h>
 #include <Surelog/ErrorReporting/Location.h>

diff --git a/include/Surelog/SourceCompile/SV3_1aTreeShapeHelper.h b/include/Surelog/SourceCompile/SV3_1aTreeShapeHelper.h
@@ -26,6 +26,8 @@
 #pragma once
 
 #include <Surelog/Common/NodeId.h>
+#include <Surelog/Common/PathId.h>
+#include <Surelog/Common/SymbolId.h>
 #include <Surelog/Design/DesignElement.h>
 #include <Surelog/ErrorReporting/ErrorDefinition.h>
 #include <Surelog/ErrorReporting/Location.h>

diff --git a/src/API/SLAPI.cpp b/src/API/SLAPI.cpp
@@ -26,7 +26,11 @@
 #ifdef SURELOG_WITH_PYTHON
 #include "Surelog/API/SV3_1aPythonListener.h"
 #include "Surelog/Common/NodeId.h"
+#include "Surelog/Common/PathId.h"
+#include "Surelog/Common/SymbolId.h"
+#include "Surelog/ErrorReporting/Error.h"
 #include "Surelog/ErrorReporting/ErrorDefinition.h"
+#include "Surelog/ErrorReporting/Location.h"
 #include "Surelog/SourceCompile/PythonListen.h"
 #include "Surelog/SourceCompile/VObjectTypes.h"
 #endif

diff --git a/src/Cache/Cache.cpp b/src/Cache/Cache.cpp
@@ -25,6 +25,7 @@
 
 #include <capnp/serialize-packed.h>
 
+#include <cstddef>
 #include <cstdint>
 #include <filesystem>
 #include <functional>
@@ -36,9 +37,13 @@
 #include "Surelog/CommandLine/CommandLineParser.h"
 #include "Surelog/Common/FileSystem.h"
 #include "Surelog/Common/NodeId.h"
+#include "Surelog/Common/PathId.h"
+#include "Surelog/Common/SymbolId.h"
 #include "Surelog/Design/FileContent.h"
+#include "Surelog/ErrorReporting/Error.h"
 #include "Surelog/ErrorReporting/ErrorContainer.h"
 #include "Surelog/ErrorReporting/ErrorDefinition.h"
+#include "Surelog/ErrorReporting/Location.h"
 #include "Surelog/SourceCompile/SymbolTable.h"
 #include "Surelog/SourceCompile/VObjectTypes.h"
 

diff --git a/src/Cache/PPCache.cpp b/src/Cache/PPCache.cpp
@@ -28,17 +28,20 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 
+#include <cstddef>
 #include <cstdint>
 #include <string>
 #include <string_view>
 #include <vector>
 
 #include "Surelog/CommandLine/CommandLineParser.h"
 #include "Surelog/Common/FileSystem.h"
+#include "Surelog/Common/PathId.h"
 #include "Surelog/Design/Design.h"
 #include "Surelog/Design/FileContent.h"
 #include "Surelog/Design/TimeInfo.h"
 #include "Surelog/ErrorReporting/ErrorDefinition.h"
+#include "Surelog/ErrorReporting/Location.h"
 #include "Surelog/Library/Library.h"
 #include "Surelog/Package/Precompiled.h"
 #include "Surelog/SourceCompile/CompilationUnit.h"

diff --git a/src/Cache/PPCache_test.cpp b/src/Cache/PPCache_test.cpp
@@ -33,6 +33,7 @@
 #include <vector>
 
 #include "Surelog/CommandLine/CommandLineParser.h"
+#include "Surelog/Common/PathId.h"
 #include "Surelog/Common/PlatformFileSystem.h"
 #include "Surelog/Design/Design.h"
 #include "Surelog/SourceCompile/Compiler.h"

diff --git a/src/Cache/ParseCache.cpp b/src/Cache/ParseCache.cpp
@@ -28,6 +28,7 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 
+#include <cstddef>
 #include <cstdint>
 #include <string>
 #include <string_view>
@@ -36,10 +37,13 @@
 #include "Surelog/CommandLine/CommandLineParser.h"
 #include "Surelog/Common/FileSystem.h"
 #include "Surelog/Common/NodeId.h"
+#include "Surelog/Common/PathId.h"
 #include "Surelog/Design/Design.h"
 #include "Surelog/Design/DesignElement.h"
 #include "Surelog/Design/FileContent.h"
+#include "Surelog/ErrorReporting/Error.h"
 #include "Surelog/ErrorReporting/ErrorDefinition.h"
+#include "Surelog/ErrorReporting/Location.h"
 #include "Surelog/Library/Library.h"
 #include "Surelog/Package/Precompiled.h"
 #include "Surelog/SourceCompile/CompileSourceFile.h"

diff --git a/src/Cache/PythonAPICache.cpp b/src/Cache/PythonAPICache.cpp
@@ -37,7 +37,10 @@
 #include "Surelog/Cache/Cache.h"
 #include "Surelog/CommandLine/CommandLineParser.h"
 #include "Surelog/Common/FileSystem.h"
+#include "Surelog/Common/PathId.h"
+#include "Surelog/ErrorReporting/Error.h"
 #include "Surelog/ErrorReporting/ErrorContainer.h"
+#include "Surelog/ErrorReporting/Location.h"
 #include "Surelog/Library/Library.h"
 #include "Surelog/SourceCompile/CompileSourceFile.h"
 #include "Surelog/SourceCompile/ParseFile.h"

diff --git a/src/CommandLine/CommandLineParser.cpp b/src/CommandLine/CommandLineParser.cpp
@@ -32,9 +32,13 @@
 #include <vector>
 
 #include "Surelog/API/PythonAPI.h"
+#include "Surelog/Common/PathId.h"
 #include "Surelog/Common/PlatformFileSystem.h"
+#include "Surelog/Common/SymbolId.h"
+#include "Surelog/ErrorReporting/Error.h"
 #include "Surelog/ErrorReporting/ErrorContainer.h"
 #include "Surelog/ErrorReporting/ErrorDefinition.h"
+#include "Surelog/ErrorReporting/Location.h"
 #include "Surelog/SourceCompile/SymbolTable.h"
 #include "Surelog/Utils/StringUtils.h"
 #include "Surelog/surelog-version.h"

diff --git a/src/CommandLine/CommandLineParser_test.cpp b/src/CommandLine/CommandLineParser_test.cpp
@@ -32,6 +32,7 @@
 #include <string>
 #include <vector>
 
+#include "Surelog/Common/PathId.h"
 #include "Surelog/Common/PlatformFileSystem.h"
 #include "Surelog/ErrorReporting/ErrorContainer.h"
 #include "Surelog/SourceCompile/SymbolTable.h"

diff --git a/src/Common/ClockingBlockHolder.cpp b/src/Common/ClockingBlockHolder.cpp
@@ -23,6 +23,8 @@
 
 #include "Surelog/Common/ClockingBlockHolder.h"
 
+#include "Surelog/Common/SymbolId.h"
+
 namespace SURELOG {
 void ClockingBlockHolder::addClockingBlock(SymbolId blockId,
                                            ClockingBlock& block) {

diff --git a/src/Common/FileSystem.cpp b/src/Common/FileSystem.cpp
@@ -23,12 +23,15 @@
 
 #include "Surelog/Common/FileSystem.h"
 
+#include "Surelog/Common/PathId.h"
+#include "Surelog/Common/SymbolId.h"
 #include "Surelog/SourceCompile/SymbolTable.h"
 
 #if defined(_WIN32)
 #define NOMINMAX
 #include <Windows.h>
 
+#include <cstddef>
 #include <cstdint>
 #include <iostream>
 #include <string>

diff --git a/src/Common/PlatformFileSystem.cpp b/src/Common/PlatformFileSystem.cpp
@@ -23,6 +23,7 @@
 
 #include "Surelog/Common/PlatformFileSystem.h"
 
+#include <cstddef>
 #include <cstdint>
 #include <filesystem>
 #include <fstream>
@@ -34,6 +35,8 @@
 #include <utility>
 #include <vector>
 
+#include "Surelog/Common/PathId.h"
+#include "Surelog/Common/SymbolId.h"
 #include "Surelog/SourceCompile/SymbolTable.h"
 #include "Surelog/Utils/StringUtils.h"
 #ifdef SURELOG_WITH_ZLIB

diff --git a/src/Common/PlatformFileSystem_test.cpp b/src/Common/PlatformFileSystem_test.cpp
@@ -24,14 +24,18 @@
 #include "Surelog/Common/PlatformFileSystem.h"
 
 #include <gtest/gtest.h>
+#include <uhdm/expr.h>
 
+#include <cstddef>
 #include <cstdint>
 #include <iostream>
 #include <set>
 #include <string_view>
 #include <utility>
 
 #include "Surelog/CommandLine/CommandLineParser.h"
+#include "Surelog/Common/PathId.h"
+#include "Surelog/Common/SymbolId.h"
 #include "Surelog/Design/Design.h"
 #include "Surelog/Library/Library.h"
 #include "Surelog/SourceCompile/CompileSourceFile.h"

diff --git a/src/Design/Design.cpp b/src/Design/Design.cpp
@@ -38,8 +38,10 @@
 #include "Surelog/Design/FileContent.h"
 #include "Surelog/Design/ModuleDefinition.h"
 #include "Surelog/Design/ModuleInstance.h"
+#include "Surelog/ErrorReporting/Error.h"
 #include "Surelog/ErrorReporting/ErrorContainer.h"
 #include "Surelog/ErrorReporting/ErrorDefinition.h"
+#include "Surelog/ErrorReporting/Location.h"
 #include "Surelog/Expression/Value.h"
 #include "Surelog/Package/Package.h"
 #include "Surelog/SourceCompile/SymbolTable.h"