diff --git a/src/language/ast/ASTNodeExpressionBuilder.cpp b/src/language/ast/ASTNodeExpressionBuilder.cpp index ebad79c586c40cd63637be21e74474b942a0d431..48b807c2f841166371bf3d5d977216e0a081746d 100644 --- a/src/language/ast/ASTNodeExpressionBuilder.cpp +++ b/src/language/ast/ASTNodeExpressionBuilder.cpp @@ -18,7 +18,7 @@ #include <language/node_processor/LocalNameProcessor.hpp> #include <language/node_processor/NameProcessor.hpp> #include <language/node_processor/OStreamProcessor.hpp> -#include <language/node_processor/TupleToVectorProcessor.hpp> +#include <language/node_processor/TupleToTinyVectorProcessor.hpp> #include <language/node_processor/ValueProcessor.hpp> #include <language/node_processor/WhileProcessor.hpp> @@ -42,11 +42,11 @@ ASTNodeExpressionBuilder::_buildExpression(ASTNode& n) switch (n.children.size()) { // tuples are made of at least two elements case 2: { - n.m_node_processor = std::make_unique<TupleToVectorProcessor<ASTNodeExpressionListProcessor, 2>>(n); + n.m_node_processor = std::make_unique<TupleToTinyVectorProcessor<ASTNodeExpressionListProcessor, 2>>(n); break; } case 3: { - n.m_node_processor = std::make_unique<TupleToVectorProcessor<ASTNodeExpressionListProcessor, 3>>(n); + n.m_node_processor = std::make_unique<TupleToTinyVectorProcessor<ASTNodeExpressionListProcessor, 3>>(n); break; } // LCOV_EXCL_START diff --git a/src/language/ast/ASTNodeFunctionExpressionBuilder.cpp b/src/language/ast/ASTNodeFunctionExpressionBuilder.cpp index 1ee869184947aed886571172914ffb3d68fb076e..597347ab8ed36b7300f3887c70065d4363587800 100644 --- a/src/language/ast/ASTNodeFunctionExpressionBuilder.cpp +++ b/src/language/ast/ASTNodeFunctionExpressionBuilder.cpp @@ -4,7 +4,7 @@ #include <language/ast/ASTNodeDataTypeFlattener.hpp> #include <language/ast/ASTNodeNaturalConversionChecker.hpp> #include <language/node_processor/FunctionProcessor.hpp> -#include <language/node_processor/TupleToVectorProcessor.hpp> +#include <language/node_processor/TupleToTinyVectorProcessor.hpp> #include <language/utils/FunctionTable.hpp> #include <language/utils/SymbolTable.hpp> @@ -404,12 +404,12 @@ ASTNodeFunctionExpressionBuilder::ASTNodeFunctionExpressionBuilder(ASTNode& node switch (vector_type.dimension()) { case 2: { node.m_node_processor = - std::make_unique<TupleToVectorProcessor<FunctionProcessor, 2>>(node, std::move(function_processor)); + std::make_unique<TupleToTinyVectorProcessor<FunctionProcessor, 2>>(node, std::move(function_processor)); break; } case 3: { node.m_node_processor = - std::make_unique<TupleToVectorProcessor<FunctionProcessor, 3>>(node, std::move(function_processor)); + std::make_unique<TupleToTinyVectorProcessor<FunctionProcessor, 3>>(node, std::move(function_processor)); break; } // LCOV_EXCL_START diff --git a/src/language/node_processor/TupleToVectorProcessor.hpp b/src/language/node_processor/TupleToTinyVectorProcessor.hpp similarity index 69% rename from src/language/node_processor/TupleToVectorProcessor.hpp rename to src/language/node_processor/TupleToTinyVectorProcessor.hpp index b8b32ac123919bb73b9cf0c32953261a79e66ef6..da4f1e08dc0351e43df185e13415669f1ef26b44 100644 --- a/src/language/node_processor/TupleToVectorProcessor.hpp +++ b/src/language/node_processor/TupleToTinyVectorProcessor.hpp @@ -1,11 +1,11 @@ -#ifndef TUPLE_TO_VECTOR_PROCESSOR_HPP -#define TUPLE_TO_VECTOR_PROCESSOR_HPP +#ifndef TUPLE_TO_TINY_VECTOR_PROCESSOR_HPP +#define TUPLE_TO_TINY_VECTOR_PROCESSOR_HPP #include <language/ast/ASTNode.hpp> #include <language/node_processor/INodeProcessor.hpp> template <typename TupleProcessorT, size_t N> -class TupleToVectorProcessor final : public INodeProcessor +class TupleToTinyVectorProcessor final : public INodeProcessor { private: ASTNode& m_node; @@ -40,11 +40,12 @@ class TupleToVectorProcessor final : public INodeProcessor return DataVariant{std::move(x)}; } - TupleToVectorProcessor(ASTNode& node) : m_node{node}, m_tuple_processor{std::make_unique<TupleProcessorT>(node)} {} + TupleToTinyVectorProcessor(ASTNode& node) : m_node{node}, m_tuple_processor{std::make_unique<TupleProcessorT>(node)} + {} - TupleToVectorProcessor(ASTNode& node, std::unique_ptr<TupleProcessorT>&& tuple_processor) + TupleToTinyVectorProcessor(ASTNode& node, std::unique_ptr<TupleProcessorT>&& tuple_processor) : m_node{node}, m_tuple_processor{std::move(tuple_processor)} {} }; -#endif // TUPLE_TO_VECTOR_PROCESSOR_HPP +#endif // TUPLE_TO_TINY_VECTOR_PROCESSOR_HPP diff --git a/tests/test_ASTNodeExpressionBuilder.cpp b/tests/test_ASTNodeExpressionBuilder.cpp index 7eedbf1be12e3934783f4f2f235aca13877acbe1..136cb587c8c15a06055972621a351f4937af649d 100644 --- a/tests/test_ASTNodeExpressionBuilder.cpp +++ b/tests/test_ASTNodeExpressionBuilder.cpp @@ -276,7 +276,7 @@ let (t,x): R*R^3, (t,x) = (0,(1,2,3)); | `-(language::name:x:NameProcessor) `-(language::expression_list:ASTNodeExpressionListProcessor) +-(language::integer:0:ValueProcessor) - `-(language::tuple_expression:TupleToVectorProcessor<ASTNodeExpressionListProcessor, 3ul>) + `-(language::tuple_expression:TupleToTinyVectorProcessor<ASTNodeExpressionListProcessor, 3ul>) +-(language::integer:1:ValueProcessor) +-(language::integer:2:ValueProcessor) `-(language::integer:3:ValueProcessor) @@ -299,7 +299,7 @@ let (t,x): R*R^2, (t,x) = (0,(1,2)); | `-(language::name:x:NameProcessor) `-(language::expression_list:ASTNodeExpressionListProcessor) +-(language::integer:0:ValueProcessor) - `-(language::tuple_expression:TupleToVectorProcessor<ASTNodeExpressionListProcessor, 2ul>) + `-(language::tuple_expression:TupleToTinyVectorProcessor<ASTNodeExpressionListProcessor, 2ul>) +-(language::integer:1:ValueProcessor) `-(language::integer:2:ValueProcessor) )"; diff --git a/tests/test_ASTNodeFunctionExpressionBuilder.cpp b/tests/test_ASTNodeFunctionExpressionBuilder.cpp index b350dea6f167c6137dc63102e4f9da655d2b9d50..70d8eb738d52e96757ff4e83c2f072a4d4af5fad 100644 --- a/tests/test_ASTNodeFunctionExpressionBuilder.cpp +++ b/tests/test_ASTNodeFunctionExpressionBuilder.cpp @@ -408,7 +408,7 @@ f(1,2); std::string_view result = R"( (root:ASTNodeListProcessor) - `-(language::function_evaluation:TupleToVectorProcessor<FunctionProcessor, 2ul>) + `-(language::function_evaluation:TupleToTinyVectorProcessor<FunctionProcessor, 2ul>) +-(language::name:f:NameProcessor) `-(language::function_argument_list:ASTNodeExpressionListProcessor) +-(language::integer:1:ValueProcessor) @@ -427,7 +427,7 @@ f(1,2,3); std::string_view result = R"( (root:ASTNodeListProcessor) - `-(language::function_evaluation:TupleToVectorProcessor<FunctionProcessor, 3ul>) + `-(language::function_evaluation:TupleToTinyVectorProcessor<FunctionProcessor, 3ul>) +-(language::name:f:NameProcessor) `-(language::function_argument_list:ASTNodeExpressionListProcessor) +-(language::integer:1:ValueProcessor) @@ -593,7 +593,7 @@ f((1,2,3)); (root:ASTNodeListProcessor) `-(language::function_evaluation:FunctionProcessor) +-(language::name:f:NameProcessor) - `-(language::tuple_expression:TupleToVectorProcessor<ASTNodeExpressionListProcessor, 3ul>) + `-(language::tuple_expression:TupleToTinyVectorProcessor<ASTNodeExpressionListProcessor, 3ul>) +-(language::integer:1:ValueProcessor) +-(language::integer:2:ValueProcessor) `-(language::integer:3:ValueProcessor) @@ -615,11 +615,11 @@ f(2,(1,2,3),(2,1.3)); +-(language::name:f:NameProcessor) `-(language::function_argument_list:ASTNodeExpressionListProcessor) +-(language::integer:2:ValueProcessor) - +-(language::tuple_expression:TupleToVectorProcessor<ASTNodeExpressionListProcessor, 3ul>) + +-(language::tuple_expression:TupleToTinyVectorProcessor<ASTNodeExpressionListProcessor, 3ul>) | +-(language::integer:1:ValueProcessor) | +-(language::integer:2:ValueProcessor) | `-(language::integer:3:ValueProcessor) - `-(language::tuple_expression:TupleToVectorProcessor<ASTNodeExpressionListProcessor, 2ul>) + `-(language::tuple_expression:TupleToTinyVectorProcessor<ASTNodeExpressionListProcessor, 2ul>) +-(language::integer:2:ValueProcessor) `-(language::real:1.3:ValueProcessor) )";