diff --git a/src/language/modules/CMakeLists.txt b/src/language/modules/CMakeLists.txt index c4edd2505b39320d39b25b7653667f7992567ccc..47f4905806ae1da9cfbdee6659f51e2dbc1a83a6 100644 --- a/src/language/modules/CMakeLists.txt +++ b/src/language/modules/CMakeLists.txt @@ -4,6 +4,7 @@ add_library(PugsLanguageModules BinaryOperatorRegisterForVh.cpp BuiltinModule.cpp CoreModule.cpp + DevUtilsModule.cpp LinearSolverModule.cpp MathFunctionRegisterForVh.cpp MathModule.cpp @@ -12,7 +13,6 @@ add_library(PugsLanguageModules SchemeModule.cpp SocketModule.cpp UnaryOperatorRegisterForVh.cpp - UtilsModule.cpp WriterModule.cpp ) diff --git a/src/language/modules/UtilsModule.cpp b/src/language/modules/DevUtilsModule.cpp similarity index 96% rename from src/language/modules/UtilsModule.cpp rename to src/language/modules/DevUtilsModule.cpp index 44d06e5377500e743172ceea12fe9ddfcd0a7d3e..f0d0d31f35f1a85213a71feb0a6feda79fa61728 100644 --- a/src/language/modules/UtilsModule.cpp +++ b/src/language/modules/DevUtilsModule.cpp @@ -1,4 +1,4 @@ -#include <language/modules/UtilsModule.hpp> +#include <language/modules/DevUtilsModule.hpp> #include <language/utils/ASTDotPrinter.hpp> #include <language/utils/ASTExecutionInfo.hpp> @@ -8,7 +8,7 @@ #include <fstream> -UtilsModule::UtilsModule() +DevUtilsModule::DevUtilsModule() { this->_addBuiltinFunction("getAST", std::make_shared<BuiltinFunctionEmbedder<std::string(void)>>( @@ -67,5 +67,5 @@ UtilsModule::UtilsModule() } void -UtilsModule::registerOperators() const +DevUtilsModule::registerOperators() const {} diff --git a/src/language/modules/DevUtilsModule.hpp b/src/language/modules/DevUtilsModule.hpp new file mode 100644 index 0000000000000000000000000000000000000000..96392a8dca7b4ddf1c158d19e12276fd6842b835 --- /dev/null +++ b/src/language/modules/DevUtilsModule.hpp @@ -0,0 +1,21 @@ +#ifndef DEV_UTILS_MODULE_HPP +#define DEV_UTILS_MODULE_HPP + +#include <language/modules/BuiltinModule.hpp> + +class DevUtilsModule : public BuiltinModule +{ + public: + std::string_view + name() const final + { + return "dev_utils"; + } + + void registerOperators() const final; + + DevUtilsModule(); + ~DevUtilsModule() = default; +}; + +#endif // DEV_UTILS_MODULE_HPP diff --git a/src/language/modules/ModuleRepository.cpp b/src/language/modules/ModuleRepository.cpp index 557947aadcdecc57e58a9b83e9dddef95dfefddd..250dc0aad77d999319e3e535a0c42959368493a8 100644 --- a/src/language/modules/ModuleRepository.cpp +++ b/src/language/modules/ModuleRepository.cpp @@ -2,12 +2,12 @@ #include <language/ast/ASTNode.hpp> #include <language/modules/CoreModule.hpp> +#include <language/modules/DevUtilsModule.hpp> #include <language/modules/LinearSolverModule.hpp> #include <language/modules/MathModule.hpp> #include <language/modules/MeshModule.hpp> #include <language/modules/SchemeModule.hpp> #include <language/modules/SocketModule.hpp> -#include <language/modules/UtilsModule.hpp> #include <language/modules/WriterModule.hpp> #include <language/utils/BasicAffectationRegistrerFor.hpp> #include <language/utils/BuiltinFunctionEmbedder.hpp> @@ -59,7 +59,7 @@ ModuleRepository::ModuleRepository() this->_subscribe(std::make_unique<MeshModule>()); this->_subscribe(std::make_unique<SchemeModule>()); this->_subscribe(std::make_unique<SocketModule>()); - this->_subscribe(std::make_unique<UtilsModule>()); + this->_subscribe(std::make_unique<DevUtilsModule>()); this->_subscribe(std::make_unique<WriterModule>()); } diff --git a/src/language/modules/UtilsModule.hpp b/src/language/modules/UtilsModule.hpp deleted file mode 100644 index 620f965eeab4e10bdb7542b9862aa1423d2f48bb..0000000000000000000000000000000000000000 --- a/src/language/modules/UtilsModule.hpp +++ /dev/null @@ -1,21 +0,0 @@ -#ifndef UTILS_MODULE_HPP -#define UTILS_MODULE_HPP - -#include <language/modules/BuiltinModule.hpp> - -class UtilsModule : public BuiltinModule -{ - public: - std::string_view - name() const final - { - return "utils"; - } - - void registerOperators() const final; - - UtilsModule(); - ~UtilsModule() = default; -}; - -#endif // UTILS_MODULE_HPP diff --git a/tests/test_ASTNodeListAffectationExpressionBuilder.cpp b/tests/test_ASTNodeListAffectationExpressionBuilder.cpp index e60096b10cd03b501f83073718eaacd630b1fd5b..7af93f6fb54b60dedad9e25f0504e69424613436 100644 --- a/tests/test_ASTNodeListAffectationExpressionBuilder.cpp +++ b/tests/test_ASTNodeListAffectationExpressionBuilder.cpp @@ -610,8 +610,6 @@ let (r1,r2,r3,r4,r5,r6,r7,r8,r9,r10,r11) : (R)*(R)*(R)*(R)*(R)*(R)*(R)*(R)*(R)*( SECTION("tuple of string") { std::string_view data = R"( -import utils; - let b:(B), b = (true, false); let n:(N), n = (2, 3, 2); let z:(Z), z = (1, 3, 4);