Include of files that are in the same directory should also
be relative to the toplevel directory. That makes reasioning
about code less ambiguous, is easier to refactor and thus is
also recommended practice in
https://google.github.io/styleguide/cppguide.html#Names_and_Order_of_Includes
Signed-off-by: Henner Zeller <h.zeller@acm.org>
diff --git a/src/API/PythonAPI.cpp b/src/API/PythonAPI.cpp
index e30869f..5666995 100644
--- a/src/API/PythonAPI.cpp
+++ b/src/API/PythonAPI.cpp
@@ -37,7 +37,7 @@
#include "parser/SV3_1aParserBaseListener.h"
-#include "SV3_1aPythonListener.h"
+#include "API/SV3_1aPythonListener.h"
using namespace SURELOG;
@@ -47,11 +47,11 @@
#include <iostream>
#include <cstdio>
#include "Python.h"
-#include "PythonAPI.h"
-#include "SLAPI.h"
-#include "slapi_wrap.cxx"
-#include "slapi.h"
-#include "vobjecttypes_py.h"
+#include "API/PythonAPI.h"
+#include "API/SLAPI.h"
+#include "API/slapi_wrap.cxx"
+#include "API/slapi.h"
+#include "API/vobjecttypes_py.h"
#include <cstdlib>
#include "SourceCompile/PythonListen.h"
@@ -199,7 +199,7 @@
if (i < argc - 1) {
m_builtinPath = argv[i + 1];
}
- }
+ }
}
Py_SetProgramName((wchar_t*)argv[0]); /* optional but recommended */
diff --git a/src/API/SLAPI.cpp b/src/API/SLAPI.cpp
index b87bb21..c6c26c8 100644
--- a/src/API/SLAPI.cpp
+++ b/src/API/SLAPI.cpp
@@ -49,12 +49,12 @@
#include "parser/SV3_1aLexer.h"
#include "parser/SV3_1aParser.h"
#include "parser/SV3_1aParserBaseListener.h"
-#include "SV3_1aPythonListener.h"
+#include "API/SV3_1aPythonListener.h"
#include "Utils/ParseUtils.h"
#include "Utils/FileUtils.h"
-#include "PythonAPI.h"
+#include "API/PythonAPI.h"
-#include "SLAPI.h"
+#include "API/SLAPI.h"
void SURELOG::SLsetWaiver(const char* messageId, const char* fileName,
unsigned int line, const char* objectName) {
diff --git a/src/API/SV3_1aPythonListener.cpp b/src/API/SV3_1aPythonListener.cpp
index 7a32fe7..93a23eb 100644
--- a/src/API/SV3_1aPythonListener.cpp
+++ b/src/API/SV3_1aPythonListener.cpp
@@ -30,11 +30,11 @@
#include "parser/SV3_1aLexer.h"
#include "parser/SV3_1aParser.h"
#include "parser/SV3_1aParserBaseListener.h"
-#include "SV3_1aPythonListener.h"
+#include "API/SV3_1aPythonListener.h"
using namespace antlr4;
#include "Utils/ParseUtils.h"
#include "Utils/FileUtils.h"
-#include "PythonAPI.h"
+#include "API/PythonAPI.h"
SV3_1aPythonListener::SV3_1aPythonListener (PythonListen* pl, PyThreadState* interpState, antlr4::CommonTokenStream* tokens, unsigned int lineOffset) :
m_pl(pl), m_interpState(interpState), m_tokens(tokens), m_lineOffset(lineOffset) { }
diff --git a/src/API/user.h b/src/API/user.h
index 4e023a1..2f366ba 100644
--- a/src/API/user.h
+++ b/src/API/user.h
@@ -856,7 +856,7 @@
/**************************** FUNCTION DECLARATIONS ***************************/
/* Include compatibility mode macro definitions. */
-//#include "vpi_compatibility.h"
+//#include "API/vpi_compatibility.h"
/* callback related */
diff --git a/src/API/vpi_user.h b/src/API/vpi_user.h
index 4e023a1..2f366ba 100644
--- a/src/API/vpi_user.h
+++ b/src/API/vpi_user.h
@@ -856,7 +856,7 @@
/**************************** FUNCTION DECLARATIONS ***************************/
/* Include compatibility mode macro definitions. */
-//#include "vpi_compatibility.h"
+//#include "API/vpi_compatibility.h"
/* callback related */
diff --git a/src/Cache/Cache.cpp b/src/Cache/Cache.cpp
index 7a8b5d1..3eedd54 100644
--- a/src/Cache/Cache.cpp
+++ b/src/Cache/Cache.cpp
@@ -28,7 +28,7 @@
#include <iostream>
#include "SourceCompile/SymbolTable.h"
#include "ErrorReporting/ErrorContainer.h"
-#include "Cache.h"
+#include "Cache/Cache.h"
#include "CommandLine/CommandLineParser.hpp"
#include "flatbuffers/util.h"
diff --git a/src/Cache/Cache.h b/src/Cache/Cache.h
index e8535b9..2ee73a4 100644
--- a/src/Cache/Cache.h
+++ b/src/Cache/Cache.h
@@ -25,7 +25,7 @@
#define CACHE_H
#include "flatbuffers/flatbuffers.h"
-#include "header_generated.h"
+#include "Cache/header_generated.h"
#include <cstdio> // For printing and file access.
namespace SURELOG {
diff --git a/src/Cache/PPCache.cpp b/src/Cache/PPCache.cpp
index 6c90d18..ae3747f 100644
--- a/src/Cache/PPCache.cpp
+++ b/src/Cache/PPCache.cpp
@@ -29,8 +29,8 @@
#include "SourceCompile/Compiler.h"
#include "Utils/StringUtils.h"
#include "Utils/FileUtils.h"
-#include "Cache.h"
-#include "PPCache.h"
+#include "Cache/Cache.h"
+#include "Cache/PPCache.h"
#include "flatbuffers/util.h"
#include <cstdio>
#include <ctime>
diff --git a/src/Cache/PPCache.h b/src/Cache/PPCache.h
index 491ea5e..3060f5d 100644
--- a/src/Cache/PPCache.h
+++ b/src/Cache/PPCache.h
@@ -25,9 +25,9 @@
#define PPCACHE_H
#include "flatbuffers/flatbuffers.h"
-#include "preproc_generated.h"
+#include "Cache/preproc_generated.h"
#include <cstdio> // For printing and file access.
-#include "Cache.h"
+#include "Cache/Cache.h"
namespace SURELOG {
diff --git a/src/Cache/ParseCache.cpp b/src/Cache/ParseCache.cpp
index 156401f..e4580e4 100644
--- a/src/Cache/ParseCache.cpp
+++ b/src/Cache/ParseCache.cpp
@@ -30,13 +30,13 @@
#include "SourceCompile/ParseFile.h"
#include "Utils/StringUtils.h"
#include "Utils/FileUtils.h"
-#include "Cache.h"
+#include "Cache/Cache.h"
#include "flatbuffers/util.h"
#include <cstdio>
#include <ctime>
#include <sys/types.h>
#include <sys/stat.h>
-#include "ParseCache.h"
+#include "Cache/ParseCache.h"
#include "Design/FileContent.h"
#include "Package/Precompiled.h"
using namespace SURELOG;
diff --git a/src/Cache/ParseCache.h b/src/Cache/ParseCache.h
index 6d8b714..d7c80c8 100644
--- a/src/Cache/ParseCache.h
+++ b/src/Cache/ParseCache.h
@@ -25,9 +25,9 @@
#define PARSECACHE_H
#include "flatbuffers/flatbuffers.h"
-#include "parser_generated.h"
+#include "Cache/parser_generated.h"
#include <cstdio> // For printing and file access.
-#include "Cache.h"
+#include "Cache/Cache.h"
namespace SURELOG {
diff --git a/src/Cache/PythonAPICache.cpp b/src/Cache/PythonAPICache.cpp
index 1842953..97da54b 100644
--- a/src/Cache/PythonAPICache.cpp
+++ b/src/Cache/PythonAPICache.cpp
@@ -31,7 +31,7 @@
#include "SourceCompile/ParseFile.h"
#include "Utils/StringUtils.h"
#include "Utils/FileUtils.h"
-#include "Cache.h"
+#include "Cache/Cache.h"
#include "flatbuffers/util.h"
#include <cstdio>
#include <ctime>
@@ -42,7 +42,7 @@
using namespace antlr4;
#include "API/PythonAPI.h"
-#include "PythonAPICache.h"
+#include "Cache/PythonAPICache.h"
#include "SourceCompile/PythonListen.h"
using namespace SURELOG;
diff --git a/src/Cache/PythonAPICache.h b/src/Cache/PythonAPICache.h
index c377582..60197a5 100644
--- a/src/Cache/PythonAPICache.h
+++ b/src/Cache/PythonAPICache.h
@@ -25,9 +25,9 @@
#define PYTHONAPICACHE_H
#include "flatbuffers/flatbuffers.h"
-#include "python_api_generated.h"
+#include "Cache/python_api_generated.h"
#include <cstdio>
-#include "Cache.h"
+#include "Cache/Cache.h"
namespace SURELOG {
diff --git a/src/CommandLine/CommandLineParser.cpp b/src/CommandLine/CommandLineParser.cpp
index 3c42472..90a4c1e 100644
--- a/src/CommandLine/CommandLineParser.cpp
+++ b/src/CommandLine/CommandLineParser.cpp
@@ -27,7 +27,7 @@
#include <sstream>
#include <sys/types.h>
#include <sys/stat.h>
-#include "CommandLineParser.hpp"
+#include "CommandLine/CommandLineParser.hpp"
#include "Utils/StringUtils.h"
#include "Utils/FileUtils.h"
diff --git a/src/Common/ClockingBlockHolder.cpp b/src/Common/ClockingBlockHolder.cpp
index 99b33ef..70b6c2b 100644
--- a/src/Common/ClockingBlockHolder.cpp
+++ b/src/Common/ClockingBlockHolder.cpp
@@ -21,7 +21,7 @@
* Created on June 1, 2018, 9:08 PM
*/
-#include "ClockingBlockHolder.h"
+#include "Common/ClockingBlockHolder.h"
using namespace SURELOG;
diff --git a/src/Config/Config.cpp b/src/Config/Config.cpp
index 065d482..c7376ce 100644
--- a/src/Config/Config.cpp
+++ b/src/Config/Config.cpp
@@ -22,7 +22,7 @@
*/
#include "SourceCompile/SymbolTable.h"
#include "Design/FileContent.h"
-#include "Config.h"
+#include "Config/Config.h"
using namespace SURELOG;
Config::~Config() {}
diff --git a/src/Config/ConfigSet.cpp b/src/Config/ConfigSet.cpp
index 56893b6..8439cc0 100644
--- a/src/Config/ConfigSet.cpp
+++ b/src/Config/ConfigSet.cpp
@@ -22,7 +22,7 @@
*/
#include "SourceCompile/SymbolTable.h"
#include "Design/FileContent.h"
-#include "ConfigSet.h"
+#include "Config/ConfigSet.h"
using namespace SURELOG;
ConfigSet::~ConfigSet() {}
diff --git a/src/Config/ConfigSet.h b/src/Config/ConfigSet.h
index e999c49..5eabd78 100644
--- a/src/Config/ConfigSet.h
+++ b/src/Config/ConfigSet.h
@@ -23,7 +23,7 @@
#ifndef CONFIGSET_H
#define CONFIGSET_H
-#include "Config.h"
+#include "Config/Config.h"
#include <vector>
namespace SURELOG {
diff --git a/src/Design/ClockingBlock.cpp b/src/Design/ClockingBlock.cpp
index 794a1b2..ef42526 100644
--- a/src/Design/ClockingBlock.cpp
+++ b/src/Design/ClockingBlock.cpp
@@ -21,9 +21,9 @@
* Created on May 26, 2018, 11:07 AM
*/
#include "SourceCompile/SymbolTable.h"
-#include "FileContent.h"
-#include "Signal.h"
-#include "ClockingBlock.h"
+#include "Design/FileContent.h"
+#include "Design/Signal.h"
+#include "Design/ClockingBlock.h"
using namespace SURELOG;
diff --git a/src/Design/DataType.cpp b/src/Design/DataType.cpp
index fdfe803..326ddb8 100644
--- a/src/Design/DataType.cpp
+++ b/src/Design/DataType.cpp
@@ -21,9 +21,9 @@
* Created on June 14, 2018, 10:07 PM
*/
#include "SourceCompile/SymbolTable.h"
-#include "FileContent.h"
+#include "Design/FileContent.h"
#include "Expression/Value.h"
-#include "DataType.h"
+#include "Design/DataType.h"
using namespace SURELOG;
diff --git a/src/Design/DefParam.cpp b/src/Design/DefParam.cpp
index 54351d7..2e8f718 100644
--- a/src/Design/DefParam.cpp
+++ b/src/Design/DefParam.cpp
@@ -23,8 +23,8 @@
#include "SourceCompile/SymbolTable.h"
#include "Library/Library.h"
-#include "FileContent.h"
-#include "DefParam.h"
+#include "Design/FileContent.h"
+#include "Design/DefParam.h"
using namespace SURELOG;
diff --git a/src/Design/Design.cpp b/src/Design/Design.cpp
index dc19f59..11226d0 100644
--- a/src/Design/Design.cpp
+++ b/src/Design/Design.cpp
@@ -25,7 +25,7 @@
#include "Utils/StringUtils.h"
#include "SourceCompile/VObjectTypes.h"
#include "Design/VObject.h"
-#include "FileContent.h"
+#include "Design/FileContent.h"
#include "SourceCompile/SymbolTable.h"
#include "ErrorReporting/Error.h"
#include "ErrorReporting/ErrorContainer.h"
@@ -37,7 +37,7 @@
#include "SourceCompile/Compiler.h"
#include "SourceCompile/ParseFile.h"
#include "Utils/FileUtils.h"
-#include "Design.h"
+#include "Design/Design.h"
#include "Testbench/ClassDefinition.h"
using namespace SURELOG;
diff --git a/src/Design/Design.h b/src/Design/Design.h
index b03352c..d22dba4 100644
--- a/src/Design/Design.h
+++ b/src/Design/Design.h
@@ -23,9 +23,9 @@
#ifndef DESIGN_H
#define DESIGN_H
-#include "ModuleDefinition.h"
-#include "ModuleInstance.h"
-#include "DefParam.h"
+#include "Design/ModuleDefinition.h"
+#include "Design/ModuleInstance.h"
+#include "Design/DefParam.h"
#include "Library/LibrarySet.h"
#include "Config/ConfigSet.h"
#include "Package/Package.h"
diff --git a/src/Design/DesignComponent.cpp b/src/Design/DesignComponent.cpp
index e5f57d6..148fbb6 100644
--- a/src/Design/DesignComponent.cpp
+++ b/src/Design/DesignComponent.cpp
@@ -23,9 +23,9 @@
#include <vector>
#include "SourceCompile/SymbolTable.h"
#include "SourceCompile/VObjectTypes.h"
-#include "FileContent.h"
-#include "DesignComponent.h"
-#include "Function.h"
+#include "Design/FileContent.h"
+#include "Design/DesignComponent.h"
+#include "Design/Function.h"
#include "Testbench/Variable.h"
using namespace SURELOG;
diff --git a/src/Design/DesignComponent.h b/src/Design/DesignComponent.h
index ce24c25..fcfd01a 100644
--- a/src/Design/DesignComponent.h
+++ b/src/Design/DesignComponent.h
@@ -26,10 +26,10 @@
#include <vector>
#include <map>
#include "SourceCompile/VObjectTypes.h"
-#include "FileCNodeId.h"
-#include "DataType.h"
+#include "Design/FileCNodeId.h"
+#include "Design/DataType.h"
#include "Testbench/TypeDef.h"
-#include "ValuedComponentI.h"
+#include "Design/ValuedComponentI.h"
namespace SURELOG {
diff --git a/src/Design/DesignElement.cpp b/src/Design/DesignElement.cpp
index 6dbf59a..9a975bf 100644
--- a/src/Design/DesignElement.cpp
+++ b/src/Design/DesignElement.cpp
@@ -21,8 +21,8 @@
* Created on June 8, 2017, 8:05 PM
*/
#include "SourceCompile/SymbolTable.h"
-#include "TimeInfo.h"
-#include "DesignElement.h"
+#include "Design/TimeInfo.h"
+#include "Design/DesignElement.h"
using namespace SURELOG;
diff --git a/src/Design/Enum.cpp b/src/Design/Enum.cpp
index e14f5e9..1d9ccd6 100644
--- a/src/Design/Enum.cpp
+++ b/src/Design/Enum.cpp
@@ -22,7 +22,7 @@
*/
#include "SourceCompile/SymbolTable.h"
#include "Design/FileContent.h"
-#include "Enum.h"
+#include "Design/Enum.h"
using namespace SURELOG;
Enum::Enum(std::string name, FileContent* fC, NodeId nodeId,
diff --git a/src/Design/Enum.h b/src/Design/Enum.h
index 83e0814..2ab5256 100644
--- a/src/Design/Enum.h
+++ b/src/Design/Enum.h
@@ -25,7 +25,7 @@
#define ENUM_H
#include <string>
#include <map>
-#include "DataType.h"
+#include "Design/DataType.h"
namespace SURELOG {
diff --git a/src/Design/FileContent.cpp b/src/Design/FileContent.cpp
index 737d03a..5eb50ec 100644
--- a/src/Design/FileContent.cpp
+++ b/src/Design/FileContent.cpp
@@ -22,11 +22,11 @@
*/
#include "SourceCompile/SymbolTable.h"
-#include "TimeInfo.h"
-#include "DesignElement.h"
+#include "Design/TimeInfo.h"
+#include "Design/DesignElement.h"
#include "Library/Library.h"
#include "ErrorReporting/ErrorContainer.h"
-#include "FileContent.h"
+#include "Design/FileContent.h"
#include <queue>
#include <iostream>
#include <stack>
diff --git a/src/Design/FileContent.h b/src/Design/FileContent.h
index 3d0224f..a0c0136 100644
--- a/src/Design/FileContent.h
+++ b/src/Design/FileContent.h
@@ -26,11 +26,11 @@
#include <vector>
#include <map>
#include <unordered_set>
-#include "TimeInfo.h"
-#include "DesignElement.h"
-#include "DesignComponent.h"
-#include "ValuedComponentI.h"
-#include "VObject.h"
+#include "Design/TimeInfo.h"
+#include "Design/DesignElement.h"
+#include "Design/DesignComponent.h"
+#include "Design/ValuedComponentI.h"
+#include "Design/VObject.h"
#include "SourceCompile/VObjectTypes.h"
namespace SURELOG {
diff --git a/src/Design/Function.cpp b/src/Design/Function.cpp
index 69bc44b..df957d1 100644
--- a/src/Design/Function.cpp
+++ b/src/Design/Function.cpp
@@ -21,7 +21,7 @@
* Created on February 21, 2019, 8:19 PM
*/
-#include "Function.h"
+#include "Design/Function.h"
using namespace SURELOG;
diff --git a/src/Design/Function.h b/src/Design/Function.h
index ab7827d..007391f 100644
--- a/src/Design/Function.h
+++ b/src/Design/Function.h
@@ -25,12 +25,12 @@
#define FUNCTION_H
#include <string>
#include "SourceCompile/SymbolTable.h"
-#include "FileContent.h"
+#include "Design/FileContent.h"
#include "SourceCompile/VObjectTypes.h"
-#include "DataType.h"
-#include "Scope.h"
-#include "TfPortItem.h"
-#include "Statement.h"
+#include "Design/DataType.h"
+#include "Design/Scope.h"
+#include "Design/TfPortItem.h"
+#include "Design/Statement.h"
#include "Testbench/Variable.h"
#include "DesignCompile/CompileHelper.h"
diff --git a/src/Design/Instance.cpp b/src/Design/Instance.cpp
index 405fec5..948bcbb 100644
--- a/src/Design/Instance.cpp
+++ b/src/Design/Instance.cpp
@@ -21,7 +21,7 @@
* Created on September 6, 2017, 10:57 PM
*/
-#include "Instance.h"
+#include "Design/Instance.h"
using namespace SURELOG;
diff --git a/src/Design/ModuleDefinition.cpp b/src/Design/ModuleDefinition.cpp
index 911597c..89da227 100644
--- a/src/Design/ModuleDefinition.cpp
+++ b/src/Design/ModuleDefinition.cpp
@@ -23,8 +23,8 @@
#include "SourceCompile/SymbolTable.h"
#include "Library/Library.h"
-#include "FileContent.h"
-#include "ModuleDefinition.h"
+#include "Design/FileContent.h"
+#include "Design/ModuleDefinition.h"
using namespace SURELOG;
diff --git a/src/Design/ModuleDefinition.h b/src/Design/ModuleDefinition.h
index 6a16402..9cd7d3b 100644
--- a/src/Design/ModuleDefinition.h
+++ b/src/Design/ModuleDefinition.h
@@ -24,11 +24,11 @@
#ifndef MODULEDEFINITION_H
#define MODULEDEFINITION_H
#include <vector>
-#include "DesignComponent.h"
-#include "ValuedComponentI.h"
-#include "Signal.h"
-#include "ClockingBlock.h"
-#include "DataType.h"
+#include "Design/DesignComponent.h"
+#include "Design/ValuedComponentI.h"
+#include "Design/Signal.h"
+#include "Design/ClockingBlock.h"
+#include "Design/DataType.h"
#include "Common/ClockingBlockHolder.h"
namespace SURELOG {
diff --git a/src/Design/ModuleInstance.cpp b/src/Design/ModuleInstance.cpp
index 3b2dfdd..ab5cb61 100644
--- a/src/Design/ModuleInstance.cpp
+++ b/src/Design/ModuleInstance.cpp
@@ -24,9 +24,9 @@
#include <iostream>
#include "SourceCompile/SymbolTable.h"
#include "Library/Library.h"
-#include "FileContent.h"
+#include "Design/FileContent.h"
-#include "ModuleInstance.h"
+#include "Design/ModuleInstance.h"
using namespace SURELOG;
ModuleInstance::ModuleInstance(DesignComponent* moduleDefinition,
diff --git a/src/Design/ModuleInstance.h b/src/Design/ModuleInstance.h
index 264b4e2..a0cce68 100644
--- a/src/Design/ModuleInstance.h
+++ b/src/Design/ModuleInstance.h
@@ -24,10 +24,10 @@
#ifndef MODULEINSTANCE_H
#define MODULEINSTANCE_H
-#include "ModuleDefinition.h"
+#include "Design/ModuleDefinition.h"
#include "Expression/Value.h"
#include "Expression/ExprBuilder.h"
-#include "ValuedComponentI.h"
+#include "Design/ValuedComponentI.h"
namespace SURELOG {
diff --git a/src/Design/Parameter.cpp b/src/Design/Parameter.cpp
index 7b22915..c81a6e7 100644
--- a/src/Design/Parameter.cpp
+++ b/src/Design/Parameter.cpp
@@ -21,7 +21,7 @@
* Created on April 15, 2019, 8:03 PM
*/
-#include "Parameter.h"
+#include "Design/Parameter.h"
using namespace SURELOG;
diff --git a/src/Design/Scope.cpp b/src/Design/Scope.cpp
index 671079c..3f16017 100644
--- a/src/Design/Scope.cpp
+++ b/src/Design/Scope.cpp
@@ -21,7 +21,7 @@
* Created on August 31, 2019, 11:24 AM
*/
-#include "Scope.h"
+#include "Design/Scope.h"
using namespace SURELOG;
diff --git a/src/Design/Scope.h b/src/Design/Scope.h
index e5f0ec4..34d9431 100644
--- a/src/Design/Scope.h
+++ b/src/Design/Scope.h
@@ -25,10 +25,10 @@
#define SCOPE_H
#include <string>
#include "SourceCompile/SymbolTable.h"
-#include "FileContent.h"
+#include "Design/FileContent.h"
#include "SourceCompile/VObjectTypes.h"
-#include "DataType.h"
-#include "TfPortItem.h"
+#include "Design/DataType.h"
+#include "Design/TfPortItem.h"
#include "Testbench/Variable.h"
#include "DesignCompile/CompileHelper.h"
diff --git a/src/Design/Signal.cpp b/src/Design/Signal.cpp
index a9bfd5b..6834dc5 100644
--- a/src/Design/Signal.cpp
+++ b/src/Design/Signal.cpp
@@ -21,8 +21,8 @@
* Created on May 6, 2018, 5:32 PM
*/
#include "SourceCompile/SymbolTable.h"
-#include "FileContent.h"
-#include "Signal.h"
+#include "Design/FileContent.h"
+#include "Design/Signal.h"
using namespace SURELOG;
diff --git a/src/Design/Signal.h b/src/Design/Signal.h
index 9bdd403..e6821ca 100644
--- a/src/Design/Signal.h
+++ b/src/Design/Signal.h
@@ -24,7 +24,7 @@
#ifndef SIGNAL_H
#define SIGNAL_H
-#include "FileContent.h"
+#include "Design/FileContent.h"
namespace SURELOG {
diff --git a/src/Design/Statement.cpp b/src/Design/Statement.cpp
index b057995..1b95299 100644
--- a/src/Design/Statement.cpp
+++ b/src/Design/Statement.cpp
@@ -21,7 +21,7 @@
* Created on May 25, 2019, 11:34 AM
*/
-#include "Statement.h"
+#include "Design/Statement.h"
using namespace SURELOG;
Statement::~Statement() {}
diff --git a/src/Design/Statement.h b/src/Design/Statement.h
index 5a64cc4..d200355 100644
--- a/src/Design/Statement.h
+++ b/src/Design/Statement.h
@@ -25,10 +25,10 @@
#define STATEMENT_H
#include <string>
#include "SourceCompile/SymbolTable.h"
-#include "FileContent.h"
+#include "Design/FileContent.h"
#include "SourceCompile/VObjectTypes.h"
-#include "DataType.h"
-#include "Scope.h"
+#include "Design/DataType.h"
+#include "Design/Scope.h"
namespace SURELOG {
diff --git a/src/Design/Task.cpp b/src/Design/Task.cpp
index c4bcf63..92be2f1 100644
--- a/src/Design/Task.cpp
+++ b/src/Design/Task.cpp
@@ -21,7 +21,7 @@
* Created on February 21, 2019, 8:19 PM
*/
-#include "Task.h"
+#include "Design/Task.h"
using namespace SURELOG;
diff --git a/src/Design/Task.h b/src/Design/Task.h
index e0c1b4a..67d3345 100644
--- a/src/Design/Task.h
+++ b/src/Design/Task.h
@@ -26,7 +26,7 @@
#include <string>
#include "SourceCompile/SymbolTable.h"
#include "Design/FileContent.h"
-#include "Function.h"
+#include "Design/Function.h"
namespace SURELOG {
diff --git a/src/Design/TfPortItem.cpp b/src/Design/TfPortItem.cpp
index 5d7a252..2255eb0 100644
--- a/src/Design/TfPortItem.cpp
+++ b/src/Design/TfPortItem.cpp
@@ -24,9 +24,9 @@
#include <string>
#include "SourceCompile/SymbolTable.h"
#include "Expression/Value.h"
-#include "DesignComponent.h"
-#include "FileContent.h"
-#include "TfPortItem.h"
+#include "Design/DesignComponent.h"
+#include "Design/FileContent.h"
+#include "Design/TfPortItem.h"
using namespace SURELOG;
diff --git a/src/Design/TimeInfo.cpp b/src/Design/TimeInfo.cpp
index 1e9b782..e30834d 100644
--- a/src/Design/TimeInfo.cpp
+++ b/src/Design/TimeInfo.cpp
@@ -22,7 +22,7 @@
*/
#include <string>
#include "SourceCompile/SymbolTable.h"
-#include "TimeInfo.h"
+#include "Design/TimeInfo.h"
using namespace SURELOG;
diff --git a/src/Design/VObject.cpp b/src/Design/VObject.cpp
index 2bef0bd..5089762 100644
--- a/src/Design/VObject.cpp
+++ b/src/Design/VObject.cpp
@@ -22,7 +22,7 @@
*/
#include <string>
#include "SourceCompile/SymbolTable.h"
-#include "VObject.h"
+#include "Design/VObject.h"
using namespace SURELOG;
diff --git a/src/Design/ValuedComponentI.cpp b/src/Design/ValuedComponentI.cpp
index 1d47230..e95e366 100644
--- a/src/Design/ValuedComponentI.cpp
+++ b/src/Design/ValuedComponentI.cpp
@@ -23,7 +23,7 @@
#include <string>
#include "Expression/ExprBuilder.h"
-#include "ValuedComponentI.h"
+#include "Design/ValuedComponentI.h"
using namespace SURELOG;
diff --git a/src/DesignCompile/Builtin.cpp b/src/DesignCompile/Builtin.cpp
index 89d131f..1a4698d 100644
--- a/src/DesignCompile/Builtin.cpp
+++ b/src/DesignCompile/Builtin.cpp
@@ -40,8 +40,8 @@
#include "SourceCompile/Compiler.h"
#include "DesignCompile/CompileDesign.h"
#include "Testbench/ClassDefinition.h"
-#include "CompileClass.h"
-#include "Builtin.h"
+#include "DesignCompile/CompileClass.h"
+#include "DesignCompile/Builtin.h"
using namespace SURELOG;
Builtin::~Builtin() {}
diff --git a/src/DesignCompile/CompileClass.cpp b/src/DesignCompile/CompileClass.cpp
index c4b83a0..44eaeda 100644
--- a/src/DesignCompile/CompileClass.cpp
+++ b/src/DesignCompile/CompileClass.cpp
@@ -40,7 +40,7 @@
#include "SourceCompile/Compiler.h"
#include "DesignCompile/CompileDesign.h"
#include "Testbench/ClassDefinition.h"
-#include "CompileClass.h"
+#include "DesignCompile/CompileClass.h"
using namespace SURELOG;
diff --git a/src/DesignCompile/CompileClass.h b/src/DesignCompile/CompileClass.h
index ec1ad44..938242e 100644
--- a/src/DesignCompile/CompileClass.h
+++ b/src/DesignCompile/CompileClass.h
@@ -24,7 +24,7 @@
#ifndef COMPILECLASS_H
#define COMPILECLASS_H
-#include "CompileHelper.h"
+#include "DesignCompile/CompileHelper.h"
namespace SURELOG {
diff --git a/src/DesignCompile/CompileDesign.cpp b/src/DesignCompile/CompileDesign.cpp
index 183125e..e4d4375 100644
--- a/src/DesignCompile/CompileDesign.cpp
+++ b/src/DesignCompile/CompileDesign.cpp
@@ -35,17 +35,17 @@
#include "SourceCompile/ParseFile.h"
#include "Testbench/ClassDefinition.h"
#include "SourceCompile/Compiler.h"
-#include "CompileDesign.h"
-#include "ResolveSymbols.h"
-#include "DesignElaboration.h"
-#include "UVMElaboration.h"
-#include "CompilePackage.h"
-#include "CompileModule.h"
-#include "CompileFileContent.h"
-#include "CompileProgram.h"
-#include "CompileClass.h"
-#include "Builtin.h"
-#include "PackageAndRootElaboration.h"
+#include "DesignCompile/CompileDesign.h"
+#include "DesignCompile/ResolveSymbols.h"
+#include "DesignCompile/DesignElaboration.h"
+#include "DesignCompile/UVMElaboration.h"
+#include "DesignCompile/CompilePackage.h"
+#include "DesignCompile/CompileModule.h"
+#include "DesignCompile/CompileFileContent.h"
+#include "DesignCompile/CompileProgram.h"
+#include "DesignCompile/CompileClass.h"
+#include "DesignCompile/Builtin.h"
+#include "DesignCompile/PackageAndRootElaboration.h"
#ifdef USETBB
#include <tbb/task.h>
diff --git a/src/DesignCompile/CompileFileContent.cpp b/src/DesignCompile/CompileFileContent.cpp
index a64b26a..da01f49 100644
--- a/src/DesignCompile/CompileFileContent.cpp
+++ b/src/DesignCompile/CompileFileContent.cpp
@@ -36,9 +36,9 @@
#include "SourceCompile/CompileSourceFile.h"
#include "SourceCompile/ParseFile.h"
#include "SourceCompile/Compiler.h"
-#include "CompileDesign.h"
-#include "CompileFileContent.h"
-#include "CompileHelper.h"
+#include "DesignCompile/CompileDesign.h"
+#include "DesignCompile/CompileFileContent.h"
+#include "DesignCompile/CompileHelper.h"
using namespace SURELOG;
diff --git a/src/DesignCompile/CompileFileContent.h b/src/DesignCompile/CompileFileContent.h
index 6823b40..c9f235e 100644
--- a/src/DesignCompile/CompileFileContent.h
+++ b/src/DesignCompile/CompileFileContent.h
@@ -24,7 +24,7 @@
#ifndef COMPILEFILECONTENT_H
#define COMPILEFILECONTENT_H
-#include "CompileHelper.h"
+#include "DesignCompile/CompileHelper.h"
namespace SURELOG {
diff --git a/src/DesignCompile/CompileHelper.cpp b/src/DesignCompile/CompileHelper.cpp
index bb61fca..20d1b51 100644
--- a/src/DesignCompile/CompileHelper.cpp
+++ b/src/DesignCompile/CompileHelper.cpp
@@ -32,7 +32,7 @@
#include "SourceCompile/ParseFile.h"
#include "SourceCompile/Compiler.h"
#include "Design/Design.h"
-#include "CompileHelper.h"
+#include "DesignCompile/CompileHelper.h"
#include <iostream>
using namespace SURELOG;
diff --git a/src/DesignCompile/CompileModule.cpp b/src/DesignCompile/CompileModule.cpp
index 2bdd498..7ca6367 100644
--- a/src/DesignCompile/CompileModule.cpp
+++ b/src/DesignCompile/CompileModule.cpp
@@ -40,9 +40,9 @@
#include "SourceCompile/ParseFile.h"
#include "SourceCompile/Compiler.h"
#include "Testbench/ClassDefinition.h"
-#include "CompileHelper.h"
-#include "CompileDesign.h"
-#include "CompileModule.h"
+#include "DesignCompile/CompileHelper.h"
+#include "DesignCompile/CompileDesign.h"
+#include "DesignCompile/CompileModule.h"
using namespace SURELOG;
diff --git a/src/DesignCompile/CompileModule.h b/src/DesignCompile/CompileModule.h
index af912ea..ae3ab4d 100644
--- a/src/DesignCompile/CompileModule.h
+++ b/src/DesignCompile/CompileModule.h
@@ -24,7 +24,7 @@
#ifndef COMPILEMODULE_H
#define COMPILEMODULE_H
-#include "CompileHelper.h"
+#include "DesignCompile/CompileHelper.h"
namespace SURELOG {
diff --git a/src/DesignCompile/CompilePackage.cpp b/src/DesignCompile/CompilePackage.cpp
index e475270..d34f434 100644
--- a/src/DesignCompile/CompilePackage.cpp
+++ b/src/DesignCompile/CompilePackage.cpp
@@ -38,9 +38,9 @@
#include "SourceCompile/ParseFile.h"
#include "SourceCompile/Compiler.h"
#include "Design/Statement.h"
-#include "CompileDesign.h"
-#include "CompileHelper.h"
-#include "CompilePackage.h"
+#include "DesignCompile/CompileDesign.h"
+#include "DesignCompile/CompileHelper.h"
+#include "DesignCompile/CompilePackage.h"
using namespace SURELOG;
diff --git a/src/DesignCompile/CompileProgram.cpp b/src/DesignCompile/CompileProgram.cpp
index b48852b..0b8752d 100644
--- a/src/DesignCompile/CompileProgram.cpp
+++ b/src/DesignCompile/CompileProgram.cpp
@@ -39,9 +39,9 @@
#include "SourceCompile/CompileSourceFile.h"
#include "SourceCompile/ParseFile.h"
#include "SourceCompile/Compiler.h"
-#include "CompileHelper.h"
-#include "CompileDesign.h"
-#include "CompileProgram.h"
+#include "DesignCompile/CompileHelper.h"
+#include "DesignCompile/CompileDesign.h"
+#include "DesignCompile/CompileProgram.h"
using namespace SURELOG;
diff --git a/src/DesignCompile/CompileProgram.h b/src/DesignCompile/CompileProgram.h
index aac270c..980b056 100644
--- a/src/DesignCompile/CompileProgram.h
+++ b/src/DesignCompile/CompileProgram.h
@@ -24,8 +24,8 @@
#ifndef COMPILEPROGRAM_H
#define COMPILEPROGRAM_H
-#include "CompileToolbox.h"
-#include "CompileHelper.h"
+#include "DesignCompile/CompileToolbox.h"
+#include "DesignCompile/CompileHelper.h"
namespace SURELOG {
diff --git a/src/DesignCompile/CompileStep.cpp b/src/DesignCompile/CompileStep.cpp
index d176beb..1d6a3fb 100644
--- a/src/DesignCompile/CompileStep.cpp
+++ b/src/DesignCompile/CompileStep.cpp
@@ -21,7 +21,7 @@
* Created on July 5, 2017, 10:44 PM
*/
-#include "CompileStep.h"
+#include "DesignCompile/CompileStep.h"
using namespace SURELOG;
diff --git a/src/DesignCompile/CompileToolbox.cpp b/src/DesignCompile/CompileToolbox.cpp
index 43f25f4..c3cce4e 100644
--- a/src/DesignCompile/CompileToolbox.cpp
+++ b/src/DesignCompile/CompileToolbox.cpp
@@ -38,8 +38,8 @@
#include "SourceCompile/CompileSourceFile.h"
#include "SourceCompile/ParseFile.h"
#include "SourceCompile/Compiler.h"
-#include "CompileDesign.h"
-#include "CompileToolbox.h"
+#include "DesignCompile/CompileDesign.h"
+#include "DesignCompile/CompileToolbox.h"
using namespace SURELOG;
diff --git a/src/DesignCompile/DesignElaboration.cpp b/src/DesignCompile/DesignElaboration.cpp
index b181719..718a84d 100644
--- a/src/DesignCompile/DesignElaboration.cpp
+++ b/src/DesignCompile/DesignElaboration.cpp
@@ -38,11 +38,11 @@
#include "SourceCompile/CompileSourceFile.h"
#include "SourceCompile/ParseFile.h"
#include "SourceCompile/Compiler.h"
-#include "CompileDesign.h"
+#include "DesignCompile/CompileDesign.h"
#include "Testbench/Property.h"
#include "Design/Function.h"
#include "Testbench/ClassDefinition.h"
-#include "DesignElaboration.h"
+#include "DesignCompile/DesignElaboration.h"
#include <queue>
using namespace SURELOG;
diff --git a/src/DesignCompile/DesignElaboration.h b/src/DesignCompile/DesignElaboration.h
index ad47858..515220d 100644
--- a/src/DesignCompile/DesignElaboration.h
+++ b/src/DesignCompile/DesignElaboration.h
@@ -24,7 +24,7 @@
#ifndef DESIGNELABORATION_H
#define DESIGNELABORATION_H
-#include "ElaborationStep.h"
+#include "DesignCompile/ElaborationStep.h"
#include "Expression/ExprBuilder.h"
namespace SURELOG {
diff --git a/src/DesignCompile/ElaborationStep.cpp b/src/DesignCompile/ElaborationStep.cpp
index ba4f8f1..bb97224 100644
--- a/src/DesignCompile/ElaborationStep.cpp
+++ b/src/DesignCompile/ElaborationStep.cpp
@@ -37,9 +37,9 @@
#include "SourceCompile/CompileSourceFile.h"
#include "SourceCompile/ParseFile.h"
#include "SourceCompile/Compiler.h"
-#include "CompileDesign.h"
+#include "DesignCompile/CompileDesign.h"
#include "Testbench/ClassDefinition.h"
-#include "ElaborationStep.h"
+#include "DesignCompile/ElaborationStep.h"
using namespace SURELOG;
diff --git a/src/DesignCompile/ElaborationStep.h b/src/DesignCompile/ElaborationStep.h
index 33bcd57..ed816b4 100644
--- a/src/DesignCompile/ElaborationStep.h
+++ b/src/DesignCompile/ElaborationStep.h
@@ -24,7 +24,7 @@
#ifndef ELABORATIONSTEP_H
#define ELABORATIONSTEP_H
-#include "CompileDesign.h"
+#include "DesignCompile/CompileDesign.h"
namespace SURELOG {
diff --git a/src/DesignCompile/PackageAndRootElaboration.cpp b/src/DesignCompile/PackageAndRootElaboration.cpp
index fb3da67..3f3e7ff 100644
--- a/src/DesignCompile/PackageAndRootElaboration.cpp
+++ b/src/DesignCompile/PackageAndRootElaboration.cpp
@@ -36,11 +36,11 @@
#include "SourceCompile/CompileSourceFile.h"
#include "SourceCompile/ParseFile.h"
#include "SourceCompile/Compiler.h"
-#include "CompileDesign.h"
+#include "DesignCompile/CompileDesign.h"
#include "Testbench/Property.h"
#include "Design/Function.h"
#include "Testbench/ClassDefinition.h"
-#include "PackageAndRootElaboration.h"
+#include "DesignCompile/PackageAndRootElaboration.h"
using namespace SURELOG;
diff --git a/src/DesignCompile/PackageAndRootElaboration.h b/src/DesignCompile/PackageAndRootElaboration.h
index 9bcefa1..f1d3137 100644
--- a/src/DesignCompile/PackageAndRootElaboration.h
+++ b/src/DesignCompile/PackageAndRootElaboration.h
@@ -24,7 +24,7 @@
#ifndef PACKAGEANDROOTELABORATION_H
#define PACKAGEANDROOTELABORATION_H
-#include "ElaborationStep.h"
+#include "DesignCompile/ElaborationStep.h"
namespace SURELOG {
diff --git a/src/DesignCompile/ResolveSymbols.cpp b/src/DesignCompile/ResolveSymbols.cpp
index c54ba76..7a87690 100644
--- a/src/DesignCompile/ResolveSymbols.cpp
+++ b/src/DesignCompile/ResolveSymbols.cpp
@@ -37,8 +37,8 @@
#include "SourceCompile/Compiler.h"
#include "Testbench/Program.h"
#include "Testbench/ClassDefinition.h"
-#include "CompileDesign.h"
-#include "ResolveSymbols.h"
+#include "DesignCompile/CompileDesign.h"
+#include "DesignCompile/ResolveSymbols.h"
using namespace SURELOG;
diff --git a/src/DesignCompile/ResolveSymbols.h b/src/DesignCompile/ResolveSymbols.h
index 51667ea..8dd08ba 100644
--- a/src/DesignCompile/ResolveSymbols.h
+++ b/src/DesignCompile/ResolveSymbols.h
@@ -25,7 +25,7 @@
#define RESOLVESYMBOLS_H
#include "Design/TimeInfo.h"
#include "Design/FileContent.h"
-#include "CompileStep.h"
+#include "DesignCompile/CompileStep.h"
namespace SURELOG {
diff --git a/src/DesignCompile/TestbenchElaboration.cpp b/src/DesignCompile/TestbenchElaboration.cpp
index a510f61..ac088b5 100644
--- a/src/DesignCompile/TestbenchElaboration.cpp
+++ b/src/DesignCompile/TestbenchElaboration.cpp
@@ -38,11 +38,11 @@
#include "SourceCompile/CompileSourceFile.h"
#include "SourceCompile/ParseFile.h"
#include "SourceCompile/Compiler.h"
-#include "CompileDesign.h"
+#include "DesignCompile/CompileDesign.h"
#include "Testbench/Property.h"
#include "Design/Function.h"
#include "Testbench/ClassDefinition.h"
-#include "TestbenchElaboration.h"
+#include "DesignCompile/TestbenchElaboration.h"
using namespace SURELOG;
diff --git a/src/DesignCompile/TestbenchElaboration.h b/src/DesignCompile/TestbenchElaboration.h
index b510ff0..0972ced 100644
--- a/src/DesignCompile/TestbenchElaboration.h
+++ b/src/DesignCompile/TestbenchElaboration.h
@@ -24,7 +24,7 @@
#ifndef TESTBENCHELABORATION_H
#define TESTBENCHELABORATION_H
-#include "ElaborationStep.h"
+#include "DesignCompile/ElaborationStep.h"
namespace SURELOG {
class Variable;
diff --git a/src/DesignCompile/UVMElaboration.cpp b/src/DesignCompile/UVMElaboration.cpp
index 3bec7de..d0d2526 100644
--- a/src/DesignCompile/UVMElaboration.cpp
+++ b/src/DesignCompile/UVMElaboration.cpp
@@ -36,11 +36,11 @@
#include "SourceCompile/CompileSourceFile.h"
#include "SourceCompile/ParseFile.h"
#include "SourceCompile/Compiler.h"
-#include "CompileDesign.h"
+#include "DesignCompile/CompileDesign.h"
#include "Testbench/Property.h"
#include "Design/Function.h"
#include "Testbench/ClassDefinition.h"
-#include "UVMElaboration.h"
+#include "DesignCompile/UVMElaboration.h"
using namespace SURELOG;
diff --git a/src/DesignCompile/UVMElaboration.h b/src/DesignCompile/UVMElaboration.h
index bffa87f..1a982c0 100644
--- a/src/DesignCompile/UVMElaboration.h
+++ b/src/DesignCompile/UVMElaboration.h
@@ -24,7 +24,7 @@
#ifndef UVMELABORATION_H
#define UVMELABORATION_H
-#include "TestbenchElaboration.h"
+#include "DesignCompile/TestbenchElaboration.h"
namespace SURELOG {
diff --git a/src/ErrorReporting/Error.cpp b/src/ErrorReporting/Error.cpp
index 4f73ccc..cf339fc 100644
--- a/src/ErrorReporting/Error.cpp
+++ b/src/ErrorReporting/Error.cpp
@@ -21,7 +21,7 @@
* Created on March 5, 2017, 11:30 PM
*/
-#include "Error.h"
+#include "ErrorReporting/Error.h"
using namespace SURELOG;
diff --git a/src/ErrorReporting/Error.h b/src/ErrorReporting/Error.h
index 87d0ada..426e6bd 100644
--- a/src/ErrorReporting/Error.h
+++ b/src/ErrorReporting/Error.h
@@ -23,10 +23,10 @@
#ifndef ERROR_H
#define ERROR_H
-#include "ErrorDefinition.h"
+#include "ErrorReporting/ErrorDefinition.h"
#include <string>
#include <vector>
-#include "Location.h"
+#include "ErrorReporting/Location.h"
namespace SURELOG {
diff --git a/src/ErrorReporting/ErrorContainer.cpp b/src/ErrorReporting/ErrorContainer.cpp
index 756a8ef..8142193 100644
--- a/src/ErrorReporting/ErrorContainer.cpp
+++ b/src/ErrorReporting/ErrorContainer.cpp
@@ -21,12 +21,12 @@
* Created on March 5, 2017, 11:12 PM
*/
-#include "ErrorContainer.h"
+#include "ErrorReporting/ErrorContainer.h"
#include <mutex>
#include <iostream>
#include <fstream>
#include "CommandLine/CommandLineParser.hpp"
-#include "Waiver.h"
+#include "ErrorReporting/Waiver.h"
#include "antlr4-runtime.h"
using namespace antlr4;
diff --git a/src/ErrorReporting/ErrorContainer.h b/src/ErrorReporting/ErrorContainer.h
index 857f01d..072f626 100644
--- a/src/ErrorReporting/ErrorContainer.h
+++ b/src/ErrorReporting/ErrorContainer.h
@@ -26,8 +26,8 @@
#include <string>
#include <vector>
#include <set>
-#include "ErrorDefinition.h"
-#include "Error.h"
+#include "ErrorReporting/ErrorDefinition.h"
+#include "ErrorReporting/Error.h"
#include "Python.h"
namespace SURELOG {
diff --git a/src/ErrorReporting/ErrorDefinition.cpp b/src/ErrorReporting/ErrorDefinition.cpp
index 9ec4d08..54fde66 100644
--- a/src/ErrorReporting/ErrorDefinition.cpp
+++ b/src/ErrorReporting/ErrorDefinition.cpp
@@ -21,7 +21,7 @@
* Created on March 5, 2017, 11:25 PM
*/
#include "Utils/StringUtils.h"
-#include "ErrorDefinition.h"
+#include "ErrorReporting/ErrorDefinition.h"
using namespace SURELOG;
diff --git a/src/ErrorReporting/Location.cpp b/src/ErrorReporting/Location.cpp
index c884a33..795e15c 100644
--- a/src/ErrorReporting/Location.cpp
+++ b/src/ErrorReporting/Location.cpp
@@ -21,7 +21,7 @@
* Created on March 6, 2017, 6:48 PM
*/
#include <string>
-#include "Location.h"
+#include "ErrorReporting/Location.h"
using namespace SURELOG;
diff --git a/src/ErrorReporting/Report.cpp b/src/ErrorReporting/Report.cpp
index eacf27a..0be3806 100644
--- a/src/ErrorReporting/Report.cpp
+++ b/src/ErrorReporting/Report.cpp
@@ -22,9 +22,9 @@
*/
#include "SourceCompile/SymbolTable.h"
-#include "ErrorContainer.h"
+#include "ErrorReporting/ErrorContainer.h"
#include "CommandLine/CommandLineParser.hpp"
-#include "Report.h"
+#include "ErrorReporting/Report.h"
#include <iostream>
#include <fstream>
#include <unistd.h>
diff --git a/src/ErrorReporting/Waiver.cpp b/src/ErrorReporting/Waiver.cpp
index e421225..76874eb 100644
--- a/src/ErrorReporting/Waiver.cpp
+++ b/src/ErrorReporting/Waiver.cpp
@@ -20,8 +20,8 @@
*
* Created on May 7, 2017, 11:11 PM
*/
-#include "ErrorDefinition.h"
-#include "Waiver.h"
+#include "ErrorReporting/ErrorDefinition.h"
+#include "ErrorReporting/Waiver.h"
#include <sstream>
#include <string>
#include <fstream>
diff --git a/src/ErrorReporting/Waiver.h b/src/ErrorReporting/Waiver.h
index 66a1b7e..df3a7b4 100644
--- a/src/ErrorReporting/Waiver.h
+++ b/src/ErrorReporting/Waiver.h
@@ -28,7 +28,7 @@
#include <set>
#include <vector>
#include <map>
-#include "ErrorDefinition.h"
+#include "ErrorReporting/ErrorDefinition.h"
namespace SURELOG {
diff --git a/src/Expression/Expr.cpp b/src/Expression/Expr.cpp
index 80d5184..56860ab 100644
--- a/src/Expression/Expr.cpp
+++ b/src/Expression/Expr.cpp
@@ -21,7 +21,7 @@
* Created on October 29, 2017, 10:21 PM
*/
-#include "Expr.h"
+#include "Expression/Expr.h"
using namespace SURELOG;
diff --git a/src/Expression/Expr.h b/src/Expression/Expr.h
index 66cb123..0d78cb9 100644
--- a/src/Expression/Expr.h
+++ b/src/Expression/Expr.h
@@ -24,7 +24,7 @@
#ifndef EXPR_H
#define EXPR_H
#include <string>
-#include "Value.h"
+#include "Expression/Value.h"
namespace SURELOG {
diff --git a/src/Expression/ExprBuilder.cpp b/src/Expression/ExprBuilder.cpp
index 1f46c83..0f18205 100644
--- a/src/Expression/ExprBuilder.cpp
+++ b/src/Expression/ExprBuilder.cpp
@@ -21,7 +21,7 @@
* Created on November 2, 2017, 9:45 PM
*/
#include "ErrorReporting/ErrorContainer.h"
-#include "ExprBuilder.h"
+#include "Expression/ExprBuilder.h"
#include "SourceCompile/VObjectTypes.h"
#include <iostream>
#include <sstream>
diff --git a/src/Expression/ExprBuilder.h b/src/Expression/ExprBuilder.h
index 1a4c60d..d9ccb0c 100644
--- a/src/Expression/ExprBuilder.h
+++ b/src/Expression/ExprBuilder.h
@@ -25,7 +25,7 @@
#define EXPRBUILDER_H
#include "SourceCompile/SymbolTable.h"
-#include "Expr.h"
+#include "Expression/Expr.h"
#include "Library/Library.h"
#include "Design/FileContent.h"
#include "Design/ValuedComponentI.h"
diff --git a/src/Expression/Value.cpp b/src/Expression/Value.cpp
index a14790d..d790f04 100644
--- a/src/Expression/Value.cpp
+++ b/src/Expression/Value.cpp
@@ -24,7 +24,7 @@
#include <cmath>
#include <cstdint>
#include <cstring>
-#include "Value.h"
+#include "Expression/Value.h"
using namespace SURELOG;
diff --git a/src/Library/AntlrLibParserErrorListener.cpp b/src/Library/AntlrLibParserErrorListener.cpp
index dcf0824..7e143e4 100644
--- a/src/Library/AntlrLibParserErrorListener.cpp
+++ b/src/Library/AntlrLibParserErrorListener.cpp
@@ -28,8 +28,8 @@
#include "Design/FileContent.h"
#include "CommandLine/CommandLineParser.hpp"
#include "ErrorReporting/ErrorContainer.h"
-#include "ParseLibraryDef.h"
-#include "AntlrLibParserErrorListener.h"
+#include "Library/ParseLibraryDef.h"
+#include "Library/AntlrLibParserErrorListener.h"
using namespace SURELOG;
void AntlrLibParserErrorListener::syntaxError(
diff --git a/src/Library/Library.cpp b/src/Library/Library.cpp
index 571c2e6..2674c39 100644
--- a/src/Library/Library.cpp
+++ b/src/Library/Library.cpp
@@ -23,7 +23,7 @@
#include "SourceCompile/SymbolTable.h"
#include "Design/FileContent.h"
#include "Design/ModuleDefinition.h"
-#include "Library.h"
+#include "Library/Library.h"
using namespace SURELOG;
diff --git a/src/Library/LibrarySet.cpp b/src/Library/LibrarySet.cpp
index 6828a3f..c8781dd 100644
--- a/src/Library/LibrarySet.cpp
+++ b/src/Library/LibrarySet.cpp
@@ -25,7 +25,7 @@
#include <iostream>
#include "SourceCompile/SymbolTable.h"
#include "ErrorReporting/ErrorContainer.h"
-#include "LibrarySet.h"
+#include "Library/LibrarySet.h"
using namespace SURELOG;
diff --git a/src/Library/LibrarySet.h b/src/Library/LibrarySet.h
index b1e597f..7a0b6b4 100644
--- a/src/Library/LibrarySet.h
+++ b/src/Library/LibrarySet.h
@@ -23,7 +23,7 @@
#ifndef LIBRARYSET_H
#define LIBRARYSET_H
-#include "Library.h"
+#include "Library/Library.h"
#include <vector>
namespace SURELOG {
diff --git a/src/Library/ParseLibraryDef.cpp b/src/Library/ParseLibraryDef.cpp
index 0281957..c6197e4 100644
--- a/src/Library/ParseLibraryDef.cpp
+++ b/src/Library/ParseLibraryDef.cpp
@@ -27,7 +27,7 @@
#include "SourceCompile/CompileSourceFile.h"
#include "SourceCompile/Compiler.h"
#include "SourceCompile/ParseFile.h"
-#include "ParseLibraryDef.h"
+#include "Library/ParseLibraryDef.h"
#include "Utils/FileUtils.h"
#include "antlr4-runtime.h"
#include "atn/ParserATNSimulator.h"
@@ -35,8 +35,8 @@
using namespace SURELOG;
#include "parser/SV3_1aLexer.h"
#include "parser/SV3_1aParser.h"
-#include "SVLibShapeListener.h"
-#include "AntlrLibParserErrorListener.h"
+#include "Library/SVLibShapeListener.h"
+#include "Library/AntlrLibParserErrorListener.h"
ParseLibraryDef::ParseLibraryDef(CommandLineParser* commandLineParser,
ErrorContainer* errors,
diff --git a/src/Library/ParseLibraryDef.h b/src/Library/ParseLibraryDef.h
index 477cca6..fc3cf09 100644
--- a/src/Library/ParseLibraryDef.h
+++ b/src/Library/ParseLibraryDef.h
@@ -23,7 +23,7 @@
#ifndef PARSELIBRARYDEF_H
#define PARSELIBRARYDEF_H
-#include "LibrarySet.h"
+#include "Library/LibrarySet.h"
#include "Config/ConfigSet.h"
#include "Design/FileContent.h"
diff --git a/src/Library/SVLibShapeListener.cpp b/src/Library/SVLibShapeListener.cpp
index c4ce8e1..2272936 100644
--- a/src/Library/SVLibShapeListener.cpp
+++ b/src/Library/SVLibShapeListener.cpp
@@ -26,13 +26,13 @@
#include "SourceCompile/CompileSourceFile.h"
#include "SourceCompile/Compiler.h"
#include "SourceCompile/ParseFile.h"
-#include "ParseLibraryDef.h"
+#include "Library/ParseLibraryDef.h"
#include "Utils/FileUtils.h"
#include "antlr4-runtime.h"
#include "atn/ParserATNSimulator.h"
using namespace antlr4;
-#include "ParseLibraryDef.h"
-#include "SVLibShapeListener.h"
+#include "Library/ParseLibraryDef.h"
+#include "Library/SVLibShapeListener.h"
#include "Utils/FileUtils.h"
#include "Utils/ParseUtils.h"
using namespace SURELOG;
diff --git a/src/Package/Package.cpp b/src/Package/Package.cpp
index fe13bd3..756a47b 100644
--- a/src/Package/Package.cpp
+++ b/src/Package/Package.cpp
@@ -22,7 +22,7 @@
*/
#include "SourceCompile/SymbolTable.h"
#include "Expression/ExprBuilder.h"
-#include "Package.h"
+#include "Package/Package.h"
#include "Testbench/ClassDefinition.h"
using namespace SURELOG;
diff --git a/src/Package/Precompiled.cpp b/src/Package/Precompiled.cpp
index 6799160..588180c 100644
--- a/src/Package/Precompiled.cpp
+++ b/src/Package/Precompiled.cpp
@@ -21,7 +21,7 @@
* Created on April 28, 2018, 10:27 AM
*/
-#include "Precompiled.h"
+#include "Package/Precompiled.h"
Precompiled* Precompiled::m_singleton = NULL;
diff --git a/src/SourceCompile/AnalyzeFile.cpp b/src/SourceCompile/AnalyzeFile.cpp
index 69b05a1..07c668f 100644
--- a/src/SourceCompile/AnalyzeFile.cpp
+++ b/src/SourceCompile/AnalyzeFile.cpp
@@ -28,14 +28,14 @@
#include "ErrorReporting/Location.h"
#include "ErrorReporting/ErrorDefinition.h"
#include "ErrorReporting/ErrorContainer.h"
-#include "IncludeFileInfo.h"
+#include "SourceCompile/IncludeFileInfo.h"
#include "Utils/StringUtils.h"
-#include "CompilationUnit.h"
-#include "PreprocessFile.h"
+#include "SourceCompile/CompilationUnit.h"
+#include "SourceCompile/PreprocessFile.h"
#include "SourceCompile/CompileSourceFile.h"
#include "SourceCompile/Compiler.h"
#include "Design/Design.h"
-#include "AnalyzeFile.h"
+#include "SourceCompile/AnalyzeFile.h"
#include <fstream>
#include <stdio.h>
#include <ctype.h>
diff --git a/src/SourceCompile/AnalyzeFile.h b/src/SourceCompile/AnalyzeFile.h
index f964a63..b110ee5 100644
--- a/src/SourceCompile/AnalyzeFile.h
+++ b/src/SourceCompile/AnalyzeFile.h
@@ -24,7 +24,7 @@
#ifndef ANALYZEFILE_H
#define ANALYZEFILE_H
#include <stack>
-#include "IncludeFileInfo.h"
+#include "SourceCompile/IncludeFileInfo.h"
namespace SURELOG {
class Design;
diff --git a/src/SourceCompile/AntlrParserErrorListener.cpp b/src/SourceCompile/AntlrParserErrorListener.cpp
index 3516919..c266f4d 100644
--- a/src/SourceCompile/AntlrParserErrorListener.cpp
+++ b/src/SourceCompile/AntlrParserErrorListener.cpp
@@ -24,17 +24,17 @@
#include "atn/ParserATNSimulator.h"
using namespace std;
using namespace antlr4;
-#include "SymbolTable.h"
+#include "SourceCompile/SymbolTable.h"
#include "CommandLine/CommandLineParser.hpp"
#include "ErrorReporting/ErrorContainer.h"
-#include "CompilationUnit.h"
-#include "PreprocessFile.h"
-#include "CompileSourceFile.h"
-#include "Compiler.h"
-#include "ParseFile.h"
+#include "SourceCompile/CompilationUnit.h"
+#include "SourceCompile/PreprocessFile.h"
+#include "SourceCompile/CompileSourceFile.h"
+#include "SourceCompile/Compiler.h"
+#include "SourceCompile/ParseFile.h"
#include "Utils/FileUtils.h"
#include "Utils/StringUtils.h"
-#include "AntlrParserErrorListener.h"
+#include "SourceCompile/AntlrParserErrorListener.h"
using namespace SURELOG;
void AntlrParserErrorListener::syntaxError(Recognizer *recognizer,
diff --git a/src/SourceCompile/AntlrParserHandler.cpp b/src/SourceCompile/AntlrParserHandler.cpp
index cc093c4..ed2d3e4 100644
--- a/src/SourceCompile/AntlrParserHandler.cpp
+++ b/src/SourceCompile/AntlrParserHandler.cpp
@@ -27,7 +27,7 @@
#include "parser/SV3_1aLexer.h"
#include "parser/SV3_1aParser.h"
-#include "AntlrParserHandler.h"
+#include "SourceCompile/AntlrParserHandler.h"
using namespace SURELOG;
diff --git a/src/SourceCompile/CheckCompile.cpp b/src/SourceCompile/CheckCompile.cpp
index 481d102..bd088c1 100644
--- a/src/SourceCompile/CheckCompile.cpp
+++ b/src/SourceCompile/CheckCompile.cpp
@@ -22,7 +22,7 @@
*/
#include <iostream>
#include <set>
-#include "SymbolTable.h"
+#include "SourceCompile/SymbolTable.h"
#include "Design/TimeInfo.h"
#include "Design/DesignElement.h"
#include "Design/FileContent.h"
@@ -30,13 +30,13 @@
#include "ErrorReporting/Error.h"
#include "ErrorReporting/ErrorDefinition.h"
#include "ErrorReporting/ErrorContainer.h"
-#include "CompilationUnit.h"
-#include "PreprocessFile.h"
-#include "CompileSourceFile.h"
-#include "Compiler.h"
-#include "ParseFile.h"
+#include "SourceCompile/CompilationUnit.h"
+#include "SourceCompile/PreprocessFile.h"
+#include "SourceCompile/CompileSourceFile.h"
+#include "SourceCompile/Compiler.h"
+#include "SourceCompile/ParseFile.h"
#include "CommandLine/CommandLineParser.hpp"
-#include "CheckCompile.h"
+#include "SourceCompile/CheckCompile.h"
using namespace SURELOG;
diff --git a/src/SourceCompile/CompilationUnit.cpp b/src/SourceCompile/CompilationUnit.cpp
index 7629850..b2ba799 100644
--- a/src/SourceCompile/CompilationUnit.cpp
+++ b/src/SourceCompile/CompilationUnit.cpp
@@ -20,8 +20,8 @@
*
* Created on April 5, 2017, 9:16 PM
*/
-#include "SymbolTable.h"
-#include "CompilationUnit.h"
+#include "SourceCompile/SymbolTable.h"
+#include "SourceCompile/CompilationUnit.h"
using namespace SURELOG;
diff --git a/src/SourceCompile/CompilationUnit.h b/src/SourceCompile/CompilationUnit.h
index 8a45e72..995e8a9 100644
--- a/src/SourceCompile/CompilationUnit.h
+++ b/src/SourceCompile/CompilationUnit.h
@@ -23,7 +23,7 @@
#ifndef COMPILATIONUNIT_H
#define COMPILATIONUNIT_H
-#include "MacroInfo.h"
+#include "SourceCompile/MacroInfo.h"
#include "Design/TimeInfo.h"
namespace SURELOG {
diff --git a/src/SourceCompile/CompileSourceFile.cpp b/src/SourceCompile/CompileSourceFile.cpp
index 4348034..f691135 100644
--- a/src/SourceCompile/CompileSourceFile.cpp
+++ b/src/SourceCompile/CompileSourceFile.cpp
@@ -22,20 +22,20 @@
*/
#include "CommandLine/CommandLineParser.hpp"
#include "ErrorReporting/ErrorContainer.h"
-#include "SymbolTable.h"
-#include "CompilationUnit.h"
-#include "PreprocessFile.h"
-#include "CompilationUnit.h"
+#include "SourceCompile/SymbolTable.h"
+#include "SourceCompile/CompilationUnit.h"
+#include "SourceCompile/PreprocessFile.h"
+#include "SourceCompile/CompilationUnit.h"
#include "antlr4-runtime.h"
using namespace antlr4;
#include "parser/SV3_1aLexer.h"
#include "parser/SV3_1aParser.h"
-#include "AntlrParserHandler.h"
+#include "SourceCompile/AntlrParserHandler.h"
-#include "CompileSourceFile.h"
-#include "Compiler.h"
+#include "SourceCompile/CompileSourceFile.h"
+#include "SourceCompile/Compiler.h"
#include "Utils/StringUtils.h"
#include "Utils/FileUtils.h"
#include <cstdlib>
@@ -44,10 +44,10 @@
#include <sys/types.h>
#include <sys/stat.h>
using namespace std;
-#include "PreprocessFile.h"
-#include "ParseFile.h"
+#include "SourceCompile/PreprocessFile.h"
+#include "SourceCompile/ParseFile.h"
#include "API/PythonAPI.h"
-#include "PythonListen.h"
+#include "SourceCompile/PythonListen.h"
#include "Package/Precompiled.h"
using namespace SURELOG;
diff --git a/src/SourceCompile/CompileSourceFile.h b/src/SourceCompile/CompileSourceFile.h
index a76d7bb..34f188c 100644
--- a/src/SourceCompile/CompileSourceFile.h
+++ b/src/SourceCompile/CompileSourceFile.h
@@ -26,8 +26,8 @@
#include <string>
#include <vector>
-#include "ParseFile.h"
-#include "AnalyzeFile.h"
+#include "SourceCompile/ParseFile.h"
+#include "SourceCompile/AnalyzeFile.h"
namespace SURELOG {
diff --git a/src/SourceCompile/Compiler.cpp b/src/SourceCompile/Compiler.cpp
index e09157d..ab55224 100644
--- a/src/SourceCompile/Compiler.cpp
+++ b/src/SourceCompile/Compiler.cpp
@@ -22,26 +22,26 @@
*/
#include "CommandLine/CommandLineParser.hpp"
#include "ErrorReporting/ErrorContainer.h"
-#include "SymbolTable.h"
-#include "CompilationUnit.h"
-#include "PreprocessFile.h"
-#include "CompilationUnit.h"
-#include "CompileSourceFile.h"
-#include "Compiler.h"
-#include "CheckCompile.h"
+#include "SourceCompile/SymbolTable.h"
+#include "SourceCompile/CompilationUnit.h"
+#include "SourceCompile/PreprocessFile.h"
+#include "SourceCompile/CompilationUnit.h"
+#include "SourceCompile/CompileSourceFile.h"
+#include "SourceCompile/Compiler.h"
+#include "SourceCompile/CheckCompile.h"
#include "antlr4-runtime.h"
#include "DesignCompile/CompileDesign.h"
-#include "AnalyzeFile.h"
+#include "SourceCompile/AnalyzeFile.h"
#include "Library/ParseLibraryDef.h"
#include "Utils/FileUtils.h"
#include "Package/Precompiled.h"
#include "Utils/StringUtils.h"
#include "Utils/Timer.h"
-#include "math.h"
+#include <math.h>
using namespace antlr4;
#include "API/PythonAPI.h"
-#include "CheckCompile.h"
+#include "SourceCompile/CheckCompile.h"
#include <mutex>
#include <thread>
#include <vector>
diff --git a/src/SourceCompile/Compiler.h b/src/SourceCompile/Compiler.h
index 6b6ad10..80c182b 100644
--- a/src/SourceCompile/Compiler.h
+++ b/src/SourceCompile/Compiler.h
@@ -31,7 +31,7 @@
#include "Design/Design.h"
#include "Library/LibrarySet.h"
#include "Config/ConfigSet.h"
-#include "PreprocessFile.h"
+#include "SourceCompile/PreprocessFile.h"
#ifdef USETBB
#include <tbb/task.h>
diff --git a/src/SourceCompile/LoopCheck.cpp b/src/SourceCompile/LoopCheck.cpp
index 4808895..d4a35cd 100644
--- a/src/SourceCompile/LoopCheck.cpp
+++ b/src/SourceCompile/LoopCheck.cpp
@@ -23,8 +23,8 @@
#include <queue>
#include <set>
-#include "SymbolTable.h"
-#include "LoopCheck.h"
+#include "SourceCompile/SymbolTable.h"
+#include "SourceCompile/LoopCheck.h"
using namespace SURELOG;
diff --git a/src/SourceCompile/MacroInfo.cpp b/src/SourceCompile/MacroInfo.cpp
index ffaaa87..7d5cde2 100644
--- a/src/SourceCompile/MacroInfo.cpp
+++ b/src/SourceCompile/MacroInfo.cpp
@@ -21,7 +21,7 @@
* Created on April 5, 2017, 11:46 PM
*/
-#include "SymbolTable.h"
-#include "MacroInfo.h"
+#include "SourceCompile/SymbolTable.h"
+#include "SourceCompile/MacroInfo.h"
using namespace SURELOG;
diff --git a/src/SourceCompile/ParseFile.cpp b/src/SourceCompile/ParseFile.cpp
index b8ef0b7..4757186 100644
--- a/src/SourceCompile/ParseFile.cpp
+++ b/src/SourceCompile/ParseFile.cpp
@@ -21,15 +21,15 @@
* Created on February 24, 2017, 10:03 PM
*/
-#include "SymbolTable.h"
+#include "SourceCompile/SymbolTable.h"
#include "CommandLine/CommandLineParser.hpp"
#include "ErrorReporting/ErrorContainer.h"
-#include "CompilationUnit.h"
-#include "PreprocessFile.h"
-#include "CompileSourceFile.h"
-#include "Compiler.h"
-#include "ParseFile.h"
-#include "AntlrParserHandler.h"
+#include "SourceCompile/CompilationUnit.h"
+#include "SourceCompile/PreprocessFile.h"
+#include "SourceCompile/CompileSourceFile.h"
+#include "SourceCompile/Compiler.h"
+#include "SourceCompile/ParseFile.h"
+#include "SourceCompile/AntlrParserHandler.h"
#include <cstdlib>
#include <iostream>
#include "antlr4-runtime.h"
@@ -42,13 +42,13 @@
#include "parser/SV3_1aLexer.h"
#include "parser/SV3_1aParser.h"
#include "parser/SV3_1aParserBaseListener.h"
-#include "SV3_1aTreeShapeListener.h"
+#include "SourceCompile/SV3_1aTreeShapeListener.h"
#include "API/SV3_1aPythonListener.h"
using namespace antlr4;
#include "Utils/ParseUtils.h"
#include "Utils/FileUtils.h"
#include "Cache/ParseCache.h"
-#include "AntlrParserErrorListener.h"
+#include "SourceCompile/AntlrParserErrorListener.h"
#include "Package/Precompiled.h"
#include "Utils/StringUtils.h"
#include "Utils/Timer.h"
diff --git a/src/SourceCompile/ParseFile.h b/src/SourceCompile/ParseFile.h
index 0d1276e..336d72b 100644
--- a/src/SourceCompile/ParseFile.h
+++ b/src/SourceCompile/ParseFile.h
@@ -27,7 +27,7 @@
#include "parser/SV3_1aLexer.h"
#include "parser/SV3_1aParser.h"
-#include "AntlrParserHandler.h"
+#include "SourceCompile/AntlrParserHandler.h"
#include "Design/FileContent.h"
namespace SURELOG {
diff --git a/src/SourceCompile/PreprocessFile.cpp b/src/SourceCompile/PreprocessFile.cpp
index 4820fc9..ffaa17f 100644
--- a/src/SourceCompile/PreprocessFile.cpp
+++ b/src/SourceCompile/PreprocessFile.cpp
@@ -20,13 +20,13 @@
*
* Created on February 24, 2017, 9:38 PM
*/
-#include "SymbolTable.h"
+#include "SourceCompile/SymbolTable.h"
#include "CommandLine/CommandLineParser.hpp"
#include "ErrorReporting/ErrorContainer.h"
-#include "CompilationUnit.h"
-#include "PreprocessFile.h"
-#include "CompileSourceFile.h"
-#include "Compiler.h"
+#include "SourceCompile/CompilationUnit.h"
+#include "SourceCompile/PreprocessFile.h"
+#include "SourceCompile/CompileSourceFile.h"
+#include "SourceCompile/Compiler.h"
#include "Utils/StringUtils.h"
#include "Cache/PPCache.h"
#include "ErrorReporting/Waiver.h"
@@ -51,7 +51,7 @@
std::string PreprocessFile::PP__Line__Marking = "SURELOG__LINE__MARKING";
std::string PreprocessFile::PP__File__Marking = "SURELOG__FILE__MARKING";
-#include "SV3_1aPpTreeShapeListener.h"
+#include "SourceCompile/SV3_1aPpTreeShapeListener.h"
void PreprocessFile::setDebug(int level) {
switch (level) {
@@ -324,7 +324,7 @@
c = stream.get();
}
stream.close();
-
+
try {
m_antlrParserHandler->m_inputStream = new ANTLRInputStream(text);
} catch (...) {
@@ -646,7 +646,7 @@
SpecialInstructions::AsIsUndefinedMacroInstr::ComplainUndefinedMacro);
}
}
-
+
if ((actual_args.size() > formal_args.size() && (!m_instructions.m_mute))) {
if (formal_args.size() == 0 &&
(StringUtils::getFirstNonEmptyToken(body_tokens) == "(")) {
diff --git a/src/SourceCompile/PreprocessFile.h b/src/SourceCompile/PreprocessFile.h
index 8a39f15..113f19d 100644
--- a/src/SourceCompile/PreprocessFile.h
+++ b/src/SourceCompile/PreprocessFile.h
@@ -31,10 +31,10 @@
#include "parser/SV3_1aPpLexer.h"
#include "parser/SV3_1aPpParser.h"
-#include "CompilationUnit.h"
+#include "SourceCompile/CompilationUnit.h"
#include "Library/Library.h"
-#include "LoopCheck.h"
-#include "IncludeFileInfo.h"
+#include "SourceCompile/LoopCheck.h"
+#include "SourceCompile/IncludeFileInfo.h"
namespace SURELOG {
diff --git a/src/SourceCompile/PythonListen.cpp b/src/SourceCompile/PythonListen.cpp
index 2c36419..7155c57 100644
--- a/src/SourceCompile/PythonListen.cpp
+++ b/src/SourceCompile/PythonListen.cpp
@@ -21,15 +21,15 @@
* Created on June 4, 2017, 8:09 PM
*/
-#include "SymbolTable.h"
+#include "SourceCompile/SymbolTable.h"
#include "CommandLine/CommandLineParser.hpp"
#include "ErrorReporting/ErrorContainer.h"
-#include "CompilationUnit.h"
-#include "PreprocessFile.h"
-#include "CompileSourceFile.h"
-#include "Compiler.h"
-#include "ParseFile.h"
-#include "AntlrParserHandler.h"
+#include "SourceCompile/CompilationUnit.h"
+#include "SourceCompile/PreprocessFile.h"
+#include "SourceCompile/CompileSourceFile.h"
+#include "SourceCompile/Compiler.h"
+#include "SourceCompile/ParseFile.h"
+#include "SourceCompile/AntlrParserHandler.h"
#include <cstdlib>
#include <iostream>
#include "antlr4-runtime.h"
@@ -42,7 +42,7 @@
#include "parser/SV3_1aParserBaseListener.h"
#include "API/SV3_1aPythonListener.h"
-#include "PythonListen.h"
+#include "SourceCompile/PythonListen.h"
#include "Cache/PythonAPICache.h"
using namespace SURELOG;
diff --git a/src/SourceCompile/SV3_1aPpTreeShapeListener.cpp b/src/SourceCompile/SV3_1aPpTreeShapeListener.cpp
index 696bbb6..872dda9 100644
--- a/src/SourceCompile/SV3_1aPpTreeShapeListener.cpp
+++ b/src/SourceCompile/SV3_1aPpTreeShapeListener.cpp
@@ -14,15 +14,15 @@
limitations under the License.
*/
-#include "SymbolTable.h"
+#include "SourceCompile/SymbolTable.h"
#include "CommandLine/CommandLineParser.hpp"
#include "ErrorReporting/ErrorContainer.h"
-#include "SymbolTable.h"
-#include "CompilationUnit.h"
-#include "PreprocessFile.h"
-#include "CompileSourceFile.h"
-#include "Compiler.h"
-#include "PreprocessFile.h"
+#include "SourceCompile/SymbolTable.h"
+#include "SourceCompile/CompilationUnit.h"
+#include "SourceCompile/PreprocessFile.h"
+#include "SourceCompile/CompileSourceFile.h"
+#include "SourceCompile/Compiler.h"
+#include "SourceCompile/PreprocessFile.h"
#include "Utils/StringUtils.h"
#include <cstdlib>
@@ -39,7 +39,7 @@
#include "Utils/ParseUtils.h"
#include "Utils/FileUtils.h"
-#include "SV3_1aPpTreeShapeListener.h"
+#include "SourceCompile/SV3_1aPpTreeShapeListener.h"
void SV3_1aPpTreeShapeListener::logError(ErrorDefinition::ErrorType error,
ParserRuleContext* ctx,
diff --git a/src/SourceCompile/SV3_1aPpTreeShapeListener.h b/src/SourceCompile/SV3_1aPpTreeShapeListener.h
index ad34032..6669bc6 100644
--- a/src/SourceCompile/SV3_1aPpTreeShapeListener.h
+++ b/src/SourceCompile/SV3_1aPpTreeShapeListener.h
@@ -25,11 +25,11 @@
#define SV3_1APPTREESHAPELISTENER_H
#include <regex>
-#include "PreprocessFile.h"
-#include "CompileSourceFile.h"
-#include "Compiler.h"
-#include "SymbolTable.h"
-#include "CompilationUnit.h"
+#include "SourceCompile/PreprocessFile.h"
+#include "SourceCompile/CompileSourceFile.h"
+#include "SourceCompile/Compiler.h"
+#include "SourceCompile/SymbolTable.h"
+#include "SourceCompile/CompilationUnit.h"
#include "Design/TimeInfo.h"
namespace SURELOG {
diff --git a/src/SourceCompile/SV3_1aTreeShapeHelper.cpp b/src/SourceCompile/SV3_1aTreeShapeHelper.cpp
index c1f66bb..64c6144 100644
--- a/src/SourceCompile/SV3_1aTreeShapeHelper.cpp
+++ b/src/SourceCompile/SV3_1aTreeShapeHelper.cpp
@@ -21,14 +21,14 @@
* Created on June 25, 2017, 2:51 PM
*/
-#include "SymbolTable.h"
+#include "SourceCompile/SymbolTable.h"
#include "CommandLine/CommandLineParser.hpp"
#include "ErrorReporting/ErrorContainer.h"
-#include "CompilationUnit.h"
-#include "PreprocessFile.h"
-#include "CompileSourceFile.h"
-#include "Compiler.h"
-#include "ParseFile.h"
+#include "SourceCompile/CompilationUnit.h"
+#include "SourceCompile/PreprocessFile.h"
+#include "SourceCompile/CompileSourceFile.h"
+#include "SourceCompile/Compiler.h"
+#include "SourceCompile/ParseFile.h"
#include <cstdlib>
#include <iostream>
@@ -40,10 +40,10 @@
#include "parser/SV3_1aLexer.h"
#include "parser/SV3_1aParser.h"
#include "parser/SV3_1aParserBaseListener.h"
-#include "SV3_1aTreeShapeHelper.h"
+#include "SourceCompile/SV3_1aTreeShapeHelper.h"
using namespace antlr4;
#include "Utils/ParseUtils.h"
-#include "SV3_1aTreeShapeHelper.h"
+#include "SourceCompile/SV3_1aTreeShapeHelper.h"
SV3_1aTreeShapeHelper::SV3_1aTreeShapeHelper(ParseFile* pf,
antlr4::CommonTokenStream* tokens,
diff --git a/src/SourceCompile/SV3_1aTreeShapeHelper.h b/src/SourceCompile/SV3_1aTreeShapeHelper.h
index 091a418..d278d62 100644
--- a/src/SourceCompile/SV3_1aTreeShapeHelper.h
+++ b/src/SourceCompile/SV3_1aTreeShapeHelper.h
@@ -31,12 +31,12 @@
#include "Design/TimeInfo.h"
#include "Design/DesignElement.h"
#include "Design/FileContent.h"
-#include "ParseFile.h"
-#include "CompilationUnit.h"
-#include "CompileSourceFile.h"
-#include "VObjectTypes.h"
+#include "SourceCompile/ParseFile.h"
+#include "SourceCompile/CompilationUnit.h"
+#include "SourceCompile/CompileSourceFile.h"
+#include "SourceCompile/VObjectTypes.h"
#include "Library/ParseLibraryDef.h"
-#include "IncludeFileInfo.h"
+#include "SourceCompile/IncludeFileInfo.h"
namespace SURELOG {
diff --git a/src/SourceCompile/SV3_1aTreeShapeListener.cpp b/src/SourceCompile/SV3_1aTreeShapeListener.cpp
index 803a256..4b4a408 100644
--- a/src/SourceCompile/SV3_1aTreeShapeListener.cpp
+++ b/src/SourceCompile/SV3_1aTreeShapeListener.cpp
@@ -21,14 +21,14 @@
* Created on April 16, 2017, 8:28 PM
*/
-#include "SymbolTable.h"
+#include "SourceCompile/SymbolTable.h"
#include "CommandLine/CommandLineParser.hpp"
#include "ErrorReporting/ErrorContainer.h"
-#include "CompilationUnit.h"
-#include "PreprocessFile.h"
-#include "CompileSourceFile.h"
-#include "Compiler.h"
-#include "ParseFile.h"
+#include "SourceCompile/CompilationUnit.h"
+#include "SourceCompile/PreprocessFile.h"
+#include "SourceCompile/CompileSourceFile.h"
+#include "SourceCompile/Compiler.h"
+#include "SourceCompile/ParseFile.h"
#include "Utils/StringUtils.h"
#include <cstdlib>
@@ -46,9 +46,9 @@
#include "parser/SV3_1aPpParserBaseListener.h"
#include "Utils/ParseUtils.h"
#include "Utils/FileUtils.h"
-#include "SV3_1aPpTreeShapeListener.h"
-#include "SV3_1aTreeShapeListener.h"
-#include "SV3_1aTreeShapeHelper.h"
+#include "SourceCompile/SV3_1aPpTreeShapeListener.h"
+#include "SourceCompile/SV3_1aTreeShapeListener.h"
+#include "SourceCompile/SV3_1aTreeShapeHelper.h"
using namespace antlr4;
void SV3_1aTreeShapeListener::enterTop_level_rule(
diff --git a/src/SourceCompile/SV3_1aTreeShapeListener.h b/src/SourceCompile/SV3_1aTreeShapeListener.h
index ae281c3..a5fa546 100644
--- a/src/SourceCompile/SV3_1aTreeShapeListener.h
+++ b/src/SourceCompile/SV3_1aTreeShapeListener.h
@@ -30,11 +30,11 @@
#include <stack>
#include <map>
#include <unordered_map>
-#include "Utils/ParseUtils.h"
-#include "SourceCompile/SymbolTable.h"
-#include "Design/TimeInfo.h"
-#include "Design/DesignElement.h"
-#include "Design/FileContent.h"
+#include "../Utils/ParseUtils.h"
+#include "../SourceCompile/SymbolTable.h"
+#include "../Design/TimeInfo.h"
+#include "../Design/DesignElement.h"
+#include "../Design/FileContent.h"
#include "ParseFile.h"
#include "CompilationUnit.h"
#include "CompileSourceFile.h"
diff --git a/src/SourceCompile/SymbolTable.cpp b/src/SourceCompile/SymbolTable.cpp
index 8d305e0..588ce5f 100644
--- a/src/SourceCompile/SymbolTable.cpp
+++ b/src/SourceCompile/SymbolTable.cpp
@@ -21,7 +21,7 @@
* Created on March 6, 2017, 11:10 PM
*/
#include <iostream>
-#include "SymbolTable.h"
+#include "SourceCompile/SymbolTable.h"
#include <mutex>
#include <vector>
diff --git a/src/SourceCompile/VObjectTypes.cpp b/src/SourceCompile/VObjectTypes.cpp
index 97180f4..50ded84 100644
--- a/src/SourceCompile/VObjectTypes.cpp
+++ b/src/SourceCompile/VObjectTypes.cpp
@@ -1,6 +1,6 @@
#include <string>
-#include "Design/VObject.h"
+#include "../Design/VObject.h"
// This file is automatically generated by generate_parser_listener.tcl
// DO NOT EDIT
diff --git a/src/Utils/FileUtils.cpp b/src/Utils/FileUtils.cpp
index ed68c8f..dc4310f 100644
--- a/src/Utils/FileUtils.cpp
+++ b/src/Utils/FileUtils.cpp
@@ -22,8 +22,8 @@
*/
#include "SourceCompile/SymbolTable.h"
-#include "FileUtils.h"
-#include "StringUtils.h"
+#include "Utils/FileUtils.h"
+#include "Utils/StringUtils.h"
#include <sys/stat.h>
#include <unistd.h>
#include <string.h>
diff --git a/src/Utils/ParseUtils.cpp b/src/Utils/ParseUtils.cpp
index e5b4dc2..c0e0f2c 100644
--- a/src/Utils/ParseUtils.cpp
+++ b/src/Utils/ParseUtils.cpp
@@ -24,7 +24,7 @@
#include "antlr4-runtime.h"
using namespace antlr4;
#include <vector>
-#include "ParseUtils.h"
+#include "Utils/ParseUtils.h"
using namespace SURELOG;
diff --git a/src/Utils/StringUtils.cpp b/src/Utils/StringUtils.cpp
index 06622d7..69f9ede 100644
--- a/src/Utils/StringUtils.cpp
+++ b/src/Utils/StringUtils.cpp
@@ -21,7 +21,7 @@
* Created on March 14, 2017, 10:43 PM
*/
-#include "StringUtils.h"
+#include "Utils/StringUtils.h"
#include <algorithm>
#include <locale>
#include <regex>
diff --git a/src/Utils/Timer.h b/src/Utils/Timer.h
index 6ac1dd9..1dd4804 100644
--- a/src/Utils/Timer.h
+++ b/src/Utils/Timer.h
@@ -25,7 +25,7 @@
#define TIMER_H
#include <iostream>
#include <chrono>
-#include "math.h"
+#include <math.h>
namespace SURELOG {
