From b17e96803d696564ca9cc6694c132757c208af94 Mon Sep 17 00:00:00 2001
From: Stephane Del Pino <stephane.delpino44@gmail.com>
Date: Thu, 14 May 2020 18:36:40 +0200
Subject: [PATCH] Displace more files to 'language/utils'

---
 src/language/ASTNode.hpp                                  | 2 +-
 src/language/CMakeLists.txt                               | 1 -
 src/language/FunctionTable.hpp                            | 2 +-
 src/language/SymbolTable.hpp                              | 2 +-
 src/language/modules/BuiltinModule.cpp                    | 2 +-
 src/language/modules/MeshModule.cpp                       | 2 +-
 src/language/modules/VTKModule.cpp                        | 2 +-
 src/language/node_processor/ExecutionPolicy.hpp           | 2 +-
 src/language/node_processor/FunctionArgumentConverter.hpp | 2 +-
 src/language/node_processor/INodeProcessor.hpp            | 2 +-
 src/language/utils/BuiltinFunctionEmbedder.hpp            | 4 ++--
 src/language/utils/CMakeLists.txt                         | 3 ++-
 src/language/{ => utils}/DataHandler.hpp                  | 0
 src/language/{ => utils}/DataVariant.hpp                  | 2 +-
 src/language/{ => utils}/EmbeddedData.cpp                 | 4 ++--
 src/language/{ => utils}/EmbeddedData.hpp                 | 0
 src/language/{ => utils}/TypeDescriptor.hpp               | 0
 tests/test_DataVariant.cpp                                | 2 +-
 18 files changed, 17 insertions(+), 17 deletions(-)
 rename src/language/{ => utils}/DataHandler.hpp (100%)
 rename src/language/{ => utils}/DataVariant.hpp (98%)
 rename src/language/{ => utils}/EmbeddedData.cpp (67%)
 rename src/language/{ => utils}/EmbeddedData.hpp (100%)
 rename src/language/{ => utils}/TypeDescriptor.hpp (100%)

diff --git a/src/language/ASTNode.hpp b/src/language/ASTNode.hpp
index 54332a10c..9313d90f2 100644
--- a/src/language/ASTNode.hpp
+++ b/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>
 
diff --git a/src/language/CMakeLists.txt b/src/language/CMakeLists.txt
index ee25c06d0..2cf5f1473 100644
--- a/src/language/CMakeLists.txt
+++ b/src/language/CMakeLists.txt
@@ -28,7 +28,6 @@ add_library(
   ASTNodeUnaryOperatorExpressionBuilder.cpp
   ASTSymbolTableBuilder.cpp
   ASTSymbolInitializationChecker.cpp
-  EmbeddedData.cpp
   PugsParser.cpp)
 
 # Additional dependencies
diff --git a/src/language/FunctionTable.hpp b/src/language/FunctionTable.hpp
index af262d196..614817667 100644
--- a/src/language/FunctionTable.hpp
+++ b/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>
diff --git a/src/language/SymbolTable.hpp b/src/language/SymbolTable.hpp
index 3b795f559..2187df927 100644
--- a/src/language/SymbolTable.hpp
+++ b/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>
diff --git a/src/language/modules/BuiltinModule.cpp b/src/language/modules/BuiltinModule.cpp
index cfb8b1a02..1d1df91fd 100644
--- a/src/language/modules/BuiltinModule.cpp
+++ b/src/language/modules/BuiltinModule.cpp
@@ -1,7 +1,7 @@
 #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>
diff --git a/src/language/modules/MeshModule.cpp b/src/language/modules/MeshModule.cpp
index 1255c44e3..9f8b1029f 100644
--- a/src/language/modules/MeshModule.cpp
+++ b/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>
diff --git a/src/language/modules/VTKModule.cpp b/src/language/modules/VTKModule.cpp
index 8294be3d7..6daa44f65 100644
--- a/src/language/modules/VTKModule.cpp
+++ b/src/language/modules/VTKModule.cpp
@@ -1,7 +1,7 @@
 #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>
diff --git a/src/language/node_processor/ExecutionPolicy.hpp b/src/language/node_processor/ExecutionPolicy.hpp
index 1cbf1a29b..47fc3174c 100644
--- a/src/language/node_processor/ExecutionPolicy.hpp
+++ b/src/language/node_processor/ExecutionPolicy.hpp
@@ -1,7 +1,7 @@
 #ifndef EXECUTION_POLICY_HPP
 #define EXECUTION_POLICY_HPP
 
-#include <language/DataVariant.hpp>
+#include <language/utils/DataVariant.hpp>
 #include <utils/PugsMacros.hpp>
 
 #include <memory>
diff --git a/src/language/node_processor/FunctionArgumentConverter.hpp b/src/language/node_processor/FunctionArgumentConverter.hpp
index 467bc7b24..8733211dc 100644
--- a/src/language/node_processor/FunctionArgumentConverter.hpp
+++ b/src/language/node_processor/FunctionArgumentConverter.hpp
@@ -1,8 +1,8 @@
 #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
 {
diff --git a/src/language/node_processor/INodeProcessor.hpp b/src/language/node_processor/INodeProcessor.hpp
index 1aa469520..ce06b9484 100644
--- a/src/language/node_processor/INodeProcessor.hpp
+++ b/src/language/node_processor/INodeProcessor.hpp
@@ -1,8 +1,8 @@
 #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>
diff --git a/src/language/utils/BuiltinFunctionEmbedder.hpp b/src/language/utils/BuiltinFunctionEmbedder.hpp
index 169a1f196..ab2523c72 100644
--- a/src/language/utils/BuiltinFunctionEmbedder.hpp
+++ b/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>
diff --git a/src/language/utils/CMakeLists.txt b/src/language/utils/CMakeLists.txt
index c7ce6eefd..3c6733cd4 100644
--- a/src/language/utils/CMakeLists.txt
+++ b/src/language/utils/CMakeLists.txt
@@ -3,7 +3,8 @@
 add_library(PugsLanguageUtils
   ASTDotPrinter.cpp
   ASTPrinter.cpp
-)
+  EmbeddedData.cpp
+  )
 
 
 
diff --git a/src/language/DataHandler.hpp b/src/language/utils/DataHandler.hpp
similarity index 100%
rename from src/language/DataHandler.hpp
rename to src/language/utils/DataHandler.hpp
diff --git a/src/language/DataVariant.hpp b/src/language/utils/DataVariant.hpp
similarity index 98%
rename from src/language/DataVariant.hpp
rename to src/language/utils/DataVariant.hpp
index 04dac5293..8c6667d51 100644
--- a/src/language/DataVariant.hpp
+++ b/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>
diff --git a/src/language/EmbeddedData.cpp b/src/language/utils/EmbeddedData.cpp
similarity index 67%
rename from src/language/EmbeddedData.cpp
rename to src/language/utils/EmbeddedData.cpp
index 1e75c78b6..23ab3c278 100644
--- a/src/language/EmbeddedData.cpp
+++ b/src/language/utils/EmbeddedData.cpp
@@ -1,6 +1,6 @@
-#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&)
diff --git a/src/language/EmbeddedData.hpp b/src/language/utils/EmbeddedData.hpp
similarity index 100%
rename from src/language/EmbeddedData.hpp
rename to src/language/utils/EmbeddedData.hpp
diff --git a/src/language/TypeDescriptor.hpp b/src/language/utils/TypeDescriptor.hpp
similarity index 100%
rename from src/language/TypeDescriptor.hpp
rename to src/language/utils/TypeDescriptor.hpp
diff --git a/tests/test_DataVariant.cpp b/tests/test_DataVariant.cpp
index 590d394fb..e8ce0a3c4 100644
--- a/tests/test_DataVariant.cpp
+++ b/tests/test_DataVariant.cpp
@@ -1,6 +1,6 @@
 #include <catch2/catch.hpp>
 
-#include <language/DataVariant.hpp>
+#include <language/utils/DataVariant.hpp>
 
 #include <sstream>
 
-- 
GitLab