From affe74097ecac199c4ea1022b5526b29ad975009 Mon Sep 17 00:00:00 2001 From: Joao Carreira Date: Tue, 12 Mar 2024 23:08:34 +0000 Subject: [PATCH] feat: add binary operator factory --- BinaryOperatorFactory.hpp | 32 ++++++++++++++++++++++++++++++++ BinaryOperatorFactory.tcc | 34 ++++++++++++++++++++++++++++++++++ BinaryOperatorFactoryTests.cpp | 29 +++++++++++++++++++++++++++++ CMakeLists.txt | 1 + 4 files changed, 96 insertions(+) create mode 100644 BinaryOperatorFactory.hpp create mode 100644 BinaryOperatorFactory.tcc create mode 100644 BinaryOperatorFactoryTests.cpp diff --git a/BinaryOperatorFactory.hpp b/BinaryOperatorFactory.hpp new file mode 100644 index 0000000..b1bb0a6 --- /dev/null +++ b/BinaryOperatorFactory.hpp @@ -0,0 +1,32 @@ +#ifndef CALCULATOR_CHALLENGE_BINARYOPERATORFACTORY_HPP +#define CALCULATOR_CHALLENGE_BINARYOPERATORFACTORY_HPP + +#include +#include +#include +#include + +#include "Operand.hpp" + +template +class BinaryOperatorFactory +{ + using Operator = BinaryOperatorType; + +public: + BinaryOperatorFactory() noexcept; + BinaryOperatorFactory(const BinaryOperatorFactory&) noexcept = delete; + BinaryOperatorFactory(BinaryOperatorFactory&&) noexcept = delete; + auto operator=(const BinaryOperatorFactory&) noexcept -> BinaryOperatorFactory& = delete; + auto operator=(BinaryOperatorFactory&&) noexcept -> BinaryOperatorFactory& = delete; + ~BinaryOperatorFactory() noexcept = default; + + auto make(std::string_view text) noexcept -> std::optional; + +private: + std::unordered_map _binary_operations; +}; + +#include "BinaryOperatorFactory.tcc" + +#endif diff --git a/BinaryOperatorFactory.tcc b/BinaryOperatorFactory.tcc new file mode 100644 index 0000000..ca5071f --- /dev/null +++ b/BinaryOperatorFactory.tcc @@ -0,0 +1,34 @@ + +#include "BinaryOperatorFactory.hpp" + +template +BinaryOperatorFactory::BinaryOperatorFactory() noexcept +{ + _binary_operations["+"] = [](auto lhs, auto rhs) { return lhs + rhs; }; + _binary_operations["-"] = [](auto lhs, auto rhs) { return lhs - rhs; }; + _binary_operations["*"] = [](auto lhs, auto rhs) { return lhs * rhs; }; + _binary_operations["/"] = [](auto lhs, auto rhs) { return lhs / rhs; }; +} + +template +auto BinaryOperatorFactory::make(std::string_view text) noexcept -> std::optional +{ + auto sanitize = [](std::string_view text) noexcept -> std::string { + constexpr char kSpace{' '}; + std::string_view view{text}; + + auto leading_spaces = view.find_first_not_of(kSpace); + if (leading_spaces == std::string::npos) return ""; + + auto sub_view = view.substr(leading_spaces); + + auto trailling_spaces = sub_view.find_first_of(kSpace); + if (trailling_spaces == std::string::npos) return std::string{sub_view}; + + return std::string{sub_view.substr(0, trailling_spaces)}; + }; + + auto found_op = _binary_operations.find(sanitize(text)); + if (found_op == _binary_operations.end()) return std::nullopt; + return found_op->second; +} diff --git a/BinaryOperatorFactoryTests.cpp b/BinaryOperatorFactoryTests.cpp new file mode 100644 index 0000000..148adfa --- /dev/null +++ b/BinaryOperatorFactoryTests.cpp @@ -0,0 +1,29 @@ + +#include +#include + +#include "BinaryOperatorFactory.hpp" + +TEMPLATE_TEST_CASE("BinaryOperatorFactory", "[calculator-challenge]", std::int64_t, double) +{ + constexpr TestType kLeftOperand{20}; + constexpr TestType kRightOperand{2}; + + BinaryOperatorFactory factory; + + auto check_factory = [&](std::string_view str, TestType result) { + auto operation = factory.make(str); + if (!operation.has_value()) { + return false; + } + return (*operation)(kLeftOperand, kRightOperand) == result; + }; + + CHECK(check_factory("+", kLeftOperand + kRightOperand)); + CHECK(check_factory(" + ", kLeftOperand + kRightOperand)); + CHECK(check_factory(" +", kLeftOperand + kRightOperand)); + CHECK(check_factory("+ ", kLeftOperand + kRightOperand)); + CHECK(check_factory("-", kLeftOperand - kRightOperand)); + CHECK(check_factory("*", kLeftOperand * kRightOperand)); + CHECK(check_factory("/", kLeftOperand / kRightOperand)); +} diff --git a/CMakeLists.txt b/CMakeLists.txt index 5ae98f9..929371c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -43,6 +43,7 @@ target_link_libraries(calculator-challege PRIVATE fmt::fmt) add_executable(calculator-challege-tests CalculatorTests.cpp + BinaryOperatorFactoryTests.cpp ${CALCULATOR_CHALLENGE_SOURCES} ) target_link_libraries(calculator-challege-tests PRIVATE Catch2::Catch2WithMain)