From 76f5c2b8969f23afdb8667858a57de9d948fa790 Mon Sep 17 00:00:00 2001
From: Stephane Del Pino <stephane.delpino44@gmail.com>
Date: Fri, 15 May 2020 22:34:16 +0200
Subject: [PATCH] Displace last utility files into 'language/utils'

---
 src/language/PugsParser.cpp                                 | 2 +-
 src/language/ast/ASTBuilder.cpp                             | 2 +-
 .../ast/ASTNodeBuiltinFunctionExpressionBuilder.cpp         | 2 +-
 src/language/ast/ASTNodeDataTypeBuilder.cpp                 | 2 +-
 src/language/ast/ASTNodeDataTypeFlattener.cpp               | 4 ++--
 .../ast/ASTNodeFunctionEvaluationExpressionBuilder.cpp      | 2 +-
 src/language/ast/ASTNodeFunctionExpressionBuilder.cpp       | 4 ++--
 src/language/ast/ASTSymbolInitializationChecker.cpp         | 2 +-
 src/language/ast/ASTSymbolTableBuilder.cpp                  | 2 +-
 src/language/ast/ASTSymbolTableBuilder.hpp                  | 2 +-
 src/language/modules/MeshModule.cpp                         | 6 +++---
 src/language/modules/ModuleRepository.cpp                   | 2 +-
 .../node_processor/ASTNodeExpressionListProcessor.hpp       | 2 +-
 src/language/node_processor/AffectationProcessor.hpp        | 2 +-
 src/language/node_processor/FunctionProcessor.hpp           | 4 ++--
 src/language/node_processor/IncDecExpressionProcessor.hpp   | 2 +-
 src/language/node_processor/LocalNameProcessor.hpp          | 2 +-
 src/language/node_processor/NameProcessor.hpp               | 2 +-
 src/language/node_processor/UnaryExpressionProcessor.hpp    | 2 +-
 src/language/utils/ASTNodeDataTypeTraits.hpp                | 2 +-
 src/language/utils/BuiltinFunctionEmbedder.hpp              | 2 +-
 src/language/utils/DataVariant.hpp                          | 2 +-
 src/language/{ => utils}/EmbedderTable.hpp                  | 0
 src/language/{ => utils}/FunctionSymbolId.hpp               | 0
 src/language/{ => utils}/FunctionTable.hpp                  | 0
 src/language/{ => utils}/PugsFunctionAdapter.hpp            | 2 +-
 src/language/{ => utils}/SymbolTable.hpp                    | 4 ++--
 tests/test_ASTModulesImporter.cpp                           | 2 +-
 tests/test_BuiltinFunctionEmbedderTable.cpp                 | 2 +-
 tests/test_FunctionTable.cpp                                | 2 +-
 tests/test_SymbolTable.cpp                                  | 2 +-
 31 files changed, 34 insertions(+), 34 deletions(-)
 rename src/language/{ => utils}/EmbedderTable.hpp (100%)
 rename src/language/{ => utils}/FunctionSymbolId.hpp (100%)
 rename src/language/{ => utils}/FunctionTable.hpp (100%)
 rename src/language/{ => utils}/PugsFunctionAdapter.hpp (99%)
 rename src/language/{ => utils}/SymbolTable.hpp (98%)

diff --git a/src/language/PugsParser.cpp b/src/language/PugsParser.cpp
index eced83ead..27bc4e1d0 100644
--- a/src/language/PugsParser.cpp
+++ b/src/language/PugsParser.cpp
@@ -1,7 +1,6 @@
 #include <language/PugsParser.hpp>
 
 #include <language/PEGGrammar.hpp>
-#include <language/SymbolTable.hpp>
 #include <language/ast/ASTBuilder.hpp>
 #include <language/ast/ASTModulesImporter.hpp>
 #include <language/ast/ASTNode.hpp>
@@ -16,6 +15,7 @@
 #include <language/ast/ASTSymbolTableBuilder.hpp>
 #include <language/utils/ASTDotPrinter.hpp>
 #include <language/utils/ASTPrinter.hpp>
+#include <language/utils/SymbolTable.hpp>
 #include <utils/Exceptions.hpp>
 #include <utils/PugsAssert.hpp>
 
diff --git a/src/language/ast/ASTBuilder.cpp b/src/language/ast/ASTBuilder.cpp
index 316c9e604..b0969abbb 100644
--- a/src/language/ast/ASTBuilder.cpp
+++ b/src/language/ast/ASTBuilder.cpp
@@ -3,8 +3,8 @@
 using namespace TAO_PEGTL_NAMESPACE;
 
 #include <language/PEGGrammar.hpp>
-#include <language/SymbolTable.hpp>
 #include <language/ast/ASTNode.hpp>
+#include <language/utils/SymbolTable.hpp>
 #include <utils/PugsAssert.hpp>
 
 #include <pegtl/contrib/parse_tree.hpp>
diff --git a/src/language/ast/ASTNodeBuiltinFunctionExpressionBuilder.cpp b/src/language/ast/ASTNodeBuiltinFunctionExpressionBuilder.cpp
index 96cfcfa52..cda5d08cd 100644
--- a/src/language/ast/ASTNodeBuiltinFunctionExpressionBuilder.cpp
+++ b/src/language/ast/ASTNodeBuiltinFunctionExpressionBuilder.cpp
@@ -1,10 +1,10 @@
 #include <language/ast/ASTNodeBuiltinFunctionExpressionBuilder.hpp>
 
 #include <language/PEGGrammar.hpp>
-#include <language/SymbolTable.hpp>
 #include <language/ast/ASTNodeDataTypeFlattener.hpp>
 #include <language/ast/ASTNodeNaturalConversionChecker.hpp>
 #include <language/node_processor/BuiltinFunctionProcessor.hpp>
+#include <language/utils/SymbolTable.hpp>
 
 PUGS_INLINE std::unique_ptr<IFunctionArgumentConverter>
 ASTNodeBuiltinFunctionExpressionBuilder::_getArgumentConverter(const ASTNodeDataType& parameter_type,
diff --git a/src/language/ast/ASTNodeDataTypeBuilder.cpp b/src/language/ast/ASTNodeDataTypeBuilder.cpp
index d660534b9..7d82af439 100644
--- a/src/language/ast/ASTNodeDataTypeBuilder.cpp
+++ b/src/language/ast/ASTNodeDataTypeBuilder.cpp
@@ -1,9 +1,9 @@
 #include <language/ast/ASTNodeDataTypeBuilder.hpp>
 
 #include <language/PEGGrammar.hpp>
-#include <language/SymbolTable.hpp>
 #include <language/ast/ASTNodeNaturalConversionChecker.hpp>
 #include <language/utils/BuiltinFunctionEmbedder.hpp>
+#include <language/utils/SymbolTable.hpp>
 #include <utils/PugsAssert.hpp>
 
 ASTNodeDataType
diff --git a/src/language/ast/ASTNodeDataTypeFlattener.cpp b/src/language/ast/ASTNodeDataTypeFlattener.cpp
index 7c3fc9d7e..f19ed6667 100644
--- a/src/language/ast/ASTNodeDataTypeFlattener.cpp
+++ b/src/language/ast/ASTNodeDataTypeFlattener.cpp
@@ -1,8 +1,8 @@
 #include <language/ast/ASTNodeDataTypeFlattener.hpp>
 
-#include <language/FunctionTable.hpp>
 #include <language/PEGGrammar.hpp>
-#include <language/SymbolTable.hpp>
+#include <language/utils/FunctionTable.hpp>
+#include <language/utils/SymbolTable.hpp>
 
 ASTNodeDataTypeFlattener::ASTNodeDataTypeFlattener(ASTNode& node, FlattenedDataTypeList& flattened_datatype_list)
 {
diff --git a/src/language/ast/ASTNodeFunctionEvaluationExpressionBuilder.cpp b/src/language/ast/ASTNodeFunctionEvaluationExpressionBuilder.cpp
index f7081ba0f..5eb2ed3b0 100644
--- a/src/language/ast/ASTNodeFunctionEvaluationExpressionBuilder.cpp
+++ b/src/language/ast/ASTNodeFunctionEvaluationExpressionBuilder.cpp
@@ -1,8 +1,8 @@
 #include <language/ast/ASTNodeFunctionEvaluationExpressionBuilder.hpp>
 
-#include <language/SymbolTable.hpp>
 #include <language/ast/ASTNodeBuiltinFunctionExpressionBuilder.hpp>
 #include <language/ast/ASTNodeFunctionExpressionBuilder.hpp>
+#include <language/utils/SymbolTable.hpp>
 
 ASTNodeFunctionEvaluationExpressionBuilder::ASTNodeFunctionEvaluationExpressionBuilder(ASTNode& node)
 {
diff --git a/src/language/ast/ASTNodeFunctionExpressionBuilder.cpp b/src/language/ast/ASTNodeFunctionExpressionBuilder.cpp
index 6983a6917..3518ced84 100644
--- a/src/language/ast/ASTNodeFunctionExpressionBuilder.cpp
+++ b/src/language/ast/ASTNodeFunctionExpressionBuilder.cpp
@@ -1,12 +1,12 @@
 #include <language/ast/ASTNodeFunctionExpressionBuilder.hpp>
 
-#include <language/FunctionTable.hpp>
 #include <language/PEGGrammar.hpp>
-#include <language/SymbolTable.hpp>
 #include <language/ast/ASTNodeDataTypeFlattener.hpp>
 #include <language/ast/ASTNodeNaturalConversionChecker.hpp>
 #include <language/node_processor/FunctionProcessor.hpp>
 #include <language/node_processor/TupleToVectorProcessor.hpp>
+#include <language/utils/FunctionTable.hpp>
+#include <language/utils/SymbolTable.hpp>
 
 template <typename SymbolType>
 std::unique_ptr<IFunctionArgumentConverter>
diff --git a/src/language/ast/ASTSymbolInitializationChecker.cpp b/src/language/ast/ASTSymbolInitializationChecker.cpp
index 5e8b04e93..b68e6d05a 100644
--- a/src/language/ast/ASTSymbolInitializationChecker.cpp
+++ b/src/language/ast/ASTSymbolInitializationChecker.cpp
@@ -1,7 +1,7 @@
 #include <language/ast/ASTSymbolInitializationChecker.hpp>
 
 #include <language/PEGGrammar.hpp>
-#include <language/SymbolTable.hpp>
+#include <language/utils/SymbolTable.hpp>
 
 void
 ASTSymbolInitializationChecker::_checkSymbolInitialization(ASTNode& node)
diff --git a/src/language/ast/ASTSymbolTableBuilder.cpp b/src/language/ast/ASTSymbolTableBuilder.cpp
index 98d40669b..2c8f4850a 100644
--- a/src/language/ast/ASTSymbolTableBuilder.cpp
+++ b/src/language/ast/ASTSymbolTableBuilder.cpp
@@ -1,7 +1,7 @@
 #include <language/ast/ASTSymbolTableBuilder.hpp>
 
 #include <language/PEGGrammar.hpp>
-#include <language/SymbolTable.hpp>
+#include <language/utils/SymbolTable.hpp>
 
 void
 ASTSymbolTableBuilder::buildSymbolTable(ASTNode& n, std::shared_ptr<SymbolTable>& symbol_table)
diff --git a/src/language/ast/ASTSymbolTableBuilder.hpp b/src/language/ast/ASTSymbolTableBuilder.hpp
index 881712b85..7929f7ab1 100644
--- a/src/language/ast/ASTSymbolTableBuilder.hpp
+++ b/src/language/ast/ASTSymbolTableBuilder.hpp
@@ -1,8 +1,8 @@
 #ifndef AST_SYMBOL_TABLE_BUILDER_HPP
 #define AST_SYMBOL_TABLE_BUILDER_HPP
 
-#include <language/SymbolTable.hpp>
 #include <language/ast/ASTNode.hpp>
+#include <language/utils/SymbolTable.hpp>
 
 class ASTSymbolTableBuilder
 {
diff --git a/src/language/modules/MeshModule.cpp b/src/language/modules/MeshModule.cpp
index 9f8b1029f..f0fce9aab 100644
--- a/src/language/modules/MeshModule.cpp
+++ b/src/language/modules/MeshModule.cpp
@@ -1,10 +1,10 @@
 #include <language/modules/MeshModule.hpp>
 
-#include <language/FunctionTable.hpp>
-#include <language/PugsFunctionAdapter.hpp>
-#include <language/SymbolTable.hpp>
 #include <language/node_processor/ExecutionPolicy.hpp>
 #include <language/utils/BuiltinFunctionEmbedder.hpp>
+#include <language/utils/FunctionTable.hpp>
+#include <language/utils/PugsFunctionAdapter.hpp>
+#include <language/utils/SymbolTable.hpp>
 #include <language/utils/TypeDescriptor.hpp>
 #include <mesh/Connectivity.hpp>
 #include <mesh/GmshReader.hpp>
diff --git a/src/language/modules/ModuleRepository.cpp b/src/language/modules/ModuleRepository.cpp
index a6c0805ea..30ad1914a 100644
--- a/src/language/modules/ModuleRepository.cpp
+++ b/src/language/modules/ModuleRepository.cpp
@@ -1,11 +1,11 @@
 #include <language/modules/ModuleRepository.hpp>
 
-#include <language/SymbolTable.hpp>
 #include <language/ast/ASTNode.hpp>
 #include <language/modules/MathModule.hpp>
 #include <language/modules/MeshModule.hpp>
 #include <language/modules/VTKModule.hpp>
 #include <language/utils/BuiltinFunctionEmbedder.hpp>
+#include <language/utils/SymbolTable.hpp>
 #include <utils/PugsAssert.hpp>
 
 void
diff --git a/src/language/node_processor/ASTNodeExpressionListProcessor.hpp b/src/language/node_processor/ASTNodeExpressionListProcessor.hpp
index 38bb0d340..e75992ee7 100644
--- a/src/language/node_processor/ASTNodeExpressionListProcessor.hpp
+++ b/src/language/node_processor/ASTNodeExpressionListProcessor.hpp
@@ -2,8 +2,8 @@
 #define AST_NODE_EXPRESSION_LIST_PROCESSOR_HPP
 
 #include <language/PEGGrammar.hpp>
-#include <language/SymbolTable.hpp>
 #include <language/node_processor/INodeProcessor.hpp>
+#include <language/utils/SymbolTable.hpp>
 
 #include <vector>
 
diff --git a/src/language/node_processor/AffectationProcessor.hpp b/src/language/node_processor/AffectationProcessor.hpp
index 89cf70412..bd0431e5d 100644
--- a/src/language/node_processor/AffectationProcessor.hpp
+++ b/src/language/node_processor/AffectationProcessor.hpp
@@ -2,8 +2,8 @@
 #define AFFECTATION_PROCESSOR_HPP
 
 #include <language/PEGGrammar.hpp>
-#include <language/SymbolTable.hpp>
 #include <language/node_processor/INodeProcessor.hpp>
+#include <language/utils/SymbolTable.hpp>
 
 template <typename Op>
 struct AffOp;
diff --git a/src/language/node_processor/FunctionProcessor.hpp b/src/language/node_processor/FunctionProcessor.hpp
index 72161aeda..0542f138c 100644
--- a/src/language/node_processor/FunctionProcessor.hpp
+++ b/src/language/node_processor/FunctionProcessor.hpp
@@ -1,12 +1,12 @@
 #ifndef FUNCTION_PROCESSOR_HPP
 #define FUNCTION_PROCESSOR_HPP
 
-#include <language/FunctionTable.hpp>
 #include <language/PEGGrammar.hpp>
-#include <language/SymbolTable.hpp>
 #include <language/node_processor/ASTNodeExpressionListProcessor.hpp>
 #include <language/node_processor/FunctionArgumentConverter.hpp>
 #include <language/node_processor/INodeProcessor.hpp>
+#include <language/utils/FunctionTable.hpp>
+#include <language/utils/SymbolTable.hpp>
 
 template <typename ReturnType, typename ExpressionValueType>
 class FunctionExpressionProcessor final : public INodeProcessor
diff --git a/src/language/node_processor/IncDecExpressionProcessor.hpp b/src/language/node_processor/IncDecExpressionProcessor.hpp
index 2b63b6f37..9e50106e5 100644
--- a/src/language/node_processor/IncDecExpressionProcessor.hpp
+++ b/src/language/node_processor/IncDecExpressionProcessor.hpp
@@ -2,9 +2,9 @@
 #define INC_DEC_EXPRESSION_PROCESSOR_HPP
 
 #include <language/PEGGrammar.hpp>
-#include <language/SymbolTable.hpp>
 #include <language/ast/ASTNode.hpp>
 #include <language/node_processor/INodeProcessor.hpp>
+#include <language/utils/SymbolTable.hpp>
 
 template <typename Op>
 struct IncDecOp;
diff --git a/src/language/node_processor/LocalNameProcessor.hpp b/src/language/node_processor/LocalNameProcessor.hpp
index be6ea4f4c..51d442b26 100644
--- a/src/language/node_processor/LocalNameProcessor.hpp
+++ b/src/language/node_processor/LocalNameProcessor.hpp
@@ -1,9 +1,9 @@
 #ifndef LOCAL_NODE_PROCESSOR_HPP
 #define LOCAL_NODE_PROCESSOR_HPP
 
-#include <language/SymbolTable.hpp>
 #include <language/ast/ASTNode.hpp>
 #include <language/node_processor/INodeProcessor.hpp>
+#include <language/utils/SymbolTable.hpp>
 
 class LocalNameProcessor final : public INodeProcessor
 {
diff --git a/src/language/node_processor/NameProcessor.hpp b/src/language/node_processor/NameProcessor.hpp
index 70dfac0d5..53fee78ef 100644
--- a/src/language/node_processor/NameProcessor.hpp
+++ b/src/language/node_processor/NameProcessor.hpp
@@ -1,9 +1,9 @@
 #ifndef NODE_PROCESSOR_HPP
 #define NODE_PROCESSOR_HPP
 
-#include <language/SymbolTable.hpp>
 #include <language/ast/ASTNode.hpp>
 #include <language/node_processor/INodeProcessor.hpp>
+#include <language/utils/SymbolTable.hpp>
 
 class NameProcessor final : public INodeProcessor
 {
diff --git a/src/language/node_processor/UnaryExpressionProcessor.hpp b/src/language/node_processor/UnaryExpressionProcessor.hpp
index e62facdf7..c99c7f2dd 100644
--- a/src/language/node_processor/UnaryExpressionProcessor.hpp
+++ b/src/language/node_processor/UnaryExpressionProcessor.hpp
@@ -2,8 +2,8 @@
 #define UNARY_EXPRESSION_PROCESSOR_HPP
 
 #include <language/PEGGrammar.hpp>
-#include <language/SymbolTable.hpp>
 #include <language/node_processor/INodeProcessor.hpp>
+#include <language/utils/SymbolTable.hpp>
 
 template <typename Op>
 struct UnaryOp;
diff --git a/src/language/utils/ASTNodeDataTypeTraits.hpp b/src/language/utils/ASTNodeDataTypeTraits.hpp
index 90dff3af8..44d40a771 100644
--- a/src/language/utils/ASTNodeDataTypeTraits.hpp
+++ b/src/language/utils/ASTNodeDataTypeTraits.hpp
@@ -2,8 +2,8 @@
 #define AST_NODE_DATA_TYPE_TRAITS_H
 
 #include <algebra/TinyVector.hpp>
-#include <language/FunctionSymbolId.hpp>
 #include <language/ast/ASTNodeDataType.hpp>
+#include <language/utils/FunctionSymbolId.hpp>
 
 template <typename T>
 inline ASTNodeDataType ast_node_data_type_from = ASTNodeDataType::undefined_t;
diff --git a/src/language/utils/BuiltinFunctionEmbedder.hpp b/src/language/utils/BuiltinFunctionEmbedder.hpp
index c833762c6..3a921fb5b 100644
--- a/src/language/utils/BuiltinFunctionEmbedder.hpp
+++ b/src/language/utils/BuiltinFunctionEmbedder.hpp
@@ -1,11 +1,11 @@
 #ifndef BUILTIN_FUNCTION_EMBEDDER_HPP
 #define BUILTIN_FUNCTION_EMBEDDER_HPP
 
-#include <language/FunctionTable.hpp>
 #include <language/ast/ASTNodeDataType.hpp>
 #include <language/utils/ASTNodeDataTypeTraits.hpp>
 #include <language/utils/DataHandler.hpp>
 #include <language/utils/DataVariant.hpp>
+#include <language/utils/FunctionTable.hpp>
 #include <utils/Demangle.hpp>
 #include <utils/Exceptions.hpp>
 #include <utils/PugsTraits.hpp>
diff --git a/src/language/utils/DataVariant.hpp b/src/language/utils/DataVariant.hpp
index 8c6667d51..1ca8a869d 100644
--- a/src/language/utils/DataVariant.hpp
+++ b/src/language/utils/DataVariant.hpp
@@ -2,8 +2,8 @@
 #define DATA_VARIANT_HPP
 
 #include <algebra/TinyVector.hpp>
-#include <language/FunctionSymbolId.hpp>
 #include <language/utils/EmbeddedData.hpp>
+#include <language/utils/FunctionSymbolId.hpp>
 #include <utils/PugsAssert.hpp>
 
 #include <tuple>
diff --git a/src/language/EmbedderTable.hpp b/src/language/utils/EmbedderTable.hpp
similarity index 100%
rename from src/language/EmbedderTable.hpp
rename to src/language/utils/EmbedderTable.hpp
diff --git a/src/language/FunctionSymbolId.hpp b/src/language/utils/FunctionSymbolId.hpp
similarity index 100%
rename from src/language/FunctionSymbolId.hpp
rename to src/language/utils/FunctionSymbolId.hpp
diff --git a/src/language/FunctionTable.hpp b/src/language/utils/FunctionTable.hpp
similarity index 100%
rename from src/language/FunctionTable.hpp
rename to src/language/utils/FunctionTable.hpp
diff --git a/src/language/PugsFunctionAdapter.hpp b/src/language/utils/PugsFunctionAdapter.hpp
similarity index 99%
rename from src/language/PugsFunctionAdapter.hpp
rename to src/language/utils/PugsFunctionAdapter.hpp
index e110dd4ef..33e844ec8 100644
--- a/src/language/PugsFunctionAdapter.hpp
+++ b/src/language/utils/PugsFunctionAdapter.hpp
@@ -1,12 +1,12 @@
 #ifndef PUGS_FUNCTION_ADAPTER_HPP
 #define PUGS_FUNCTION_ADAPTER_HPP
 
-#include <language/SymbolTable.hpp>
 #include <language/ast/ASTNode.hpp>
 #include <language/ast/ASTNodeDataType.hpp>
 #include <language/node_processor/ExecutionPolicy.hpp>
 #include <language/utils/ASTNodeDataTypeTraits.hpp>
 #include <language/utils/RuntimeError.hpp>
+#include <language/utils/SymbolTable.hpp>
 #include <utils/Array.hpp>
 #include <utils/Exceptions.hpp>
 #include <utils/PugsMacros.hpp>
diff --git a/src/language/SymbolTable.hpp b/src/language/utils/SymbolTable.hpp
similarity index 98%
rename from src/language/SymbolTable.hpp
rename to src/language/utils/SymbolTable.hpp
index 52866783b..957251371 100644
--- a/src/language/SymbolTable.hpp
+++ b/src/language/utils/SymbolTable.hpp
@@ -1,10 +1,10 @@
 #ifndef SYMBOL_TABLE_HPP
 #define SYMBOL_TABLE_HPP
 
-#include <language/EmbedderTable.hpp>
-#include <language/FunctionTable.hpp>
 #include <language/ast/ASTNodeDataType.hpp>
 #include <language/utils/DataVariant.hpp>
+#include <language/utils/EmbedderTable.hpp>
+#include <language/utils/FunctionTable.hpp>
 #include <utils/PugsMacros.hpp>
 
 #include <pegtl/position.hpp>
diff --git a/tests/test_ASTModulesImporter.cpp b/tests/test_ASTModulesImporter.cpp
index 5d4d0f5b8..7ac28918a 100644
--- a/tests/test_ASTModulesImporter.cpp
+++ b/tests/test_ASTModulesImporter.cpp
@@ -1,11 +1,11 @@
 #include <catch2/catch.hpp>
 
-#include <language/SymbolTable.hpp>
 #include <language/ast/ASTBuilder.hpp>
 #include <language/ast/ASTModulesImporter.hpp>
 #include <language/ast/ASTNodeExpressionBuilder.hpp>
 #include <language/ast/ASTNodeTypeCleaner.hpp>
 #include <language/utils/ASTPrinter.hpp>
+#include <language/utils/SymbolTable.hpp>
 
 #include <pegtl/string_input.hpp>
 
diff --git a/tests/test_BuiltinFunctionEmbedderTable.cpp b/tests/test_BuiltinFunctionEmbedderTable.cpp
index 1388f97c2..09b9d7c1f 100644
--- a/tests/test_BuiltinFunctionEmbedderTable.cpp
+++ b/tests/test_BuiltinFunctionEmbedderTable.cpp
@@ -1,7 +1,7 @@
 #include <catch2/catch.hpp>
 
-#include <language/EmbedderTable.hpp>
 #include <language/utils/BuiltinFunctionEmbedder.hpp>
+#include <language/utils/EmbedderTable.hpp>
 
 // clazy:excludeall=non-pod-global-static
 
diff --git a/tests/test_FunctionTable.cpp b/tests/test_FunctionTable.cpp
index d1734d9dc..c6ae9ab2f 100644
--- a/tests/test_FunctionTable.cpp
+++ b/tests/test_FunctionTable.cpp
@@ -1,6 +1,6 @@
 #include <catch2/catch.hpp>
 
-#include <language/FunctionTable.hpp>
+#include <language/utils/FunctionTable.hpp>
 
 // clazy:excludeall=non-pod-global-static
 
diff --git a/tests/test_SymbolTable.cpp b/tests/test_SymbolTable.cpp
index e8e6a8210..f7155a4ee 100644
--- a/tests/test_SymbolTable.cpp
+++ b/tests/test_SymbolTable.cpp
@@ -1,7 +1,7 @@
 #include <catch2/catch.hpp>
 
-#include <language/SymbolTable.hpp>
 #include <language/utils/BuiltinFunctionEmbedder.hpp>
+#include <language/utils/SymbolTable.hpp>
 
 #include <pegtl/internal/iterator.hpp>
 
-- 
GitLab