Displace more files to 'language/utils'

src/language/ASTNode.hpp

@@ -2,9 +2,9 @@
 #define AST_NODE_HPP
 
 #include <language/ASTNodeDataType.hpp>
-#include <language/DataVariant.hpp>
 #include <language/node_processor/ExecutionPolicy.hpp>
 #include <language/node_processor/INodeProcessor.hpp>
+#include <language/utils/DataVariant.hpp>
 #include <utils/PugsAssert.hpp>
 #include <utils/PugsMacros.hpp>
 

src/language/CMakeLists.txt

@@ -28,7 +28,6 @@ add_library(
   ASTNodeUnaryOperatorExpressionBuilder.cpp
   ASTSymbolTableBuilder.cpp
   ASTSymbolInitializationChecker.cpp
-  EmbeddedData.cpp
   PugsParser.cpp)
 
 # Additional dependencies

src/language/FunctionTable.hpp

@@ -3,7 +3,7 @@
 
 #include <language/ASTNode.hpp>
 #include <language/ASTNodeDataType.hpp>
-#include <language/DataVariant.hpp>
+#include <language/utils/DataVariant.hpp>
 #include <utils/PugsAssert.hpp>
 
 #include <pegtl/position.hpp>

src/language/SymbolTable.hpp

@@ -2,9 +2,9 @@
 #define SYMBOL_TABLE_HPP
 
 #include <language/ASTNodeDataType.hpp>
-#include <language/DataVariant.hpp>
 #include <language/EmbedderTable.hpp>
 #include <language/FunctionTable.hpp>
+#include <language/utils/DataVariant.hpp>
 #include <utils/PugsMacros.hpp>
 
 #include <pegtl/position.hpp>

src/language/modules/BuiltinModule.cpp

 #include <language/modules/BuiltinModule.hpp>
 
-#include <language/TypeDescriptor.hpp>
 #include <language/utils/BuiltinFunctionEmbedder.hpp>
+#include <language/utils/TypeDescriptor.hpp>
 #include <utils/Exceptions.hpp>
 
 #include <memory>

src/language/modules/MeshModule.cpp

@@ -3,9 +3,9 @@
 #include <language/FunctionTable.hpp>
 #include <language/PugsFunctionAdapter.hpp>
 #include <language/SymbolTable.hpp>
-#include <language/TypeDescriptor.hpp>
 #include <language/node_processor/ExecutionPolicy.hpp>
 #include <language/utils/BuiltinFunctionEmbedder.hpp>
+#include <language/utils/TypeDescriptor.hpp>
 #include <mesh/Connectivity.hpp>
 #include <mesh/GmshReader.hpp>
 #include <mesh/Mesh.hpp>

src/language/modules/VTKModule.cpp

 #include <language/modules/VTKModule.hpp>
 
-#include <language/TypeDescriptor.hpp>
 #include <language/utils/BuiltinFunctionEmbedder.hpp>
+#include <language/utils/TypeDescriptor.hpp>
 #include <mesh/Connectivity.hpp>
 #include <mesh/GmshReader.hpp>
 #include <mesh/Mesh.hpp>

src/language/node_processor/ExecutionPolicy.hpp

 #ifndef EXECUTION_POLICY_HPP
 #define EXECUTION_POLICY_HPP
 
-#include <language/DataVariant.hpp>
+#include <language/utils/DataVariant.hpp>
 #include <utils/PugsMacros.hpp>
 
 #include <memory>

src/language/node_processor/FunctionArgumentConverter.hpp

 #ifndef FUNCTION_ARGUMENT_CONVERTER_HPP
 #define FUNCTION_ARGUMENT_CONVERTER_HPP
 
-#include <language/DataVariant.hpp>
 #include <language/node_processor/ExecutionPolicy.hpp>
+#include <language/utils/DataVariant.hpp>
 
 class IFunctionArgumentConverter
 {

src/language/node_processor/INodeProcessor.hpp

 #ifndef I_NODE_PROCESSOR_HPP
 #define I_NODE_PROCESSOR_HPP
 
-#include <language/DataVariant.hpp>
 #include <language/node_processor/ExecutionPolicy.hpp>
+#include <language/utils/DataVariant.hpp>
 #include <utils/Demangle.hpp>
 
 #include <string>

src/language/utils/BuiltinFunctionEmbedder.hpp

@@ -2,10 +2,10 @@
 #define BUILTIN_FUNCTION_EMBEDDER_HPP
 
 #include <language/ASTNodeDataType.hpp>
-#include <language/DataHandler.hpp>
-#include <language/DataVariant.hpp>
 #include <language/FunctionTable.hpp>
 #include <language/utils/ASTNodeDataTypeTraits.hpp>
+#include <language/utils/DataHandler.hpp>
+#include <language/utils/DataVariant.hpp>
 #include <utils/Demangle.hpp>
 #include <utils/Exceptions.hpp>
 #include <utils/PugsTraits.hpp>

src/language/utils/CMakeLists.txt

@@ -3,6 +3,7 @@
 add_library(PugsLanguageUtils
   ASTDotPrinter.cpp
   ASTPrinter.cpp
+  EmbeddedData.cpp
   )
 
 

src/language/DataVariant.hpp → src/language/utils/DataVariant.hpp

@@ -2,8 +2,8 @@
 #define DATA_VARIANT_HPP
 
 #include <algebra/TinyVector.hpp>
-#include <language/EmbeddedData.hpp>
 #include <language/FunctionSymbolId.hpp>
+#include <language/utils/EmbeddedData.hpp>
 #include <utils/PugsAssert.hpp>
 
 #include <tuple>

src/language/EmbeddedData.cpp → src/language/utils/EmbeddedData.cpp

-#include <language/EmbeddedData.hpp>
+#include <language/utils/EmbeddedData.hpp>
 
-#include <language/DataHandler.hpp>
+#include <language/utils/DataHandler.hpp>
 
 std::ostream&
 operator<<(std::ostream& os, const EmbeddedData&)

tests/test_DataVariant.cpp

 #include <catch2/catch.hpp>
 
-#include <language/DataVariant.hpp>
+#include <language/utils/DataVariant.hpp>
 
 #include <sstream>