Introducing a new directory structure in src.

- For future addition of components, the components are organized in a multi-
level structure.
- Add `atan2`.

Author: ZCG-coder

.idea/misc.xml

@@ -24,19 +24,21 @@ CMAKE_MINIMUM_REQUIRED(VERSION 3.20)
 PROJECT(Steppable)
 
 # Ensure that Python is available to run the development scripts, and build with bindings.
-set(Python_FIND_VIRTUALENV FIRST)
+SET(Python_FIND_VIRTUALENV FIRST)
 
-find_package(
-Python
-COMPONENTS Development Interpreter
-REQUIRED)
+FIND_PACKAGE(
+    Python
+    COMPONENTS Development Interpreter
+    REQUIRED
+)
 
-find_package(
-Python3
-COMPONENTS Development Interpreter
-REQUIRED)
+FIND_PACKAGE(
+    Python3
+    COMPONENTS Development Interpreter
+    REQUIRED
+)
 
-SET(CMAKE_CXX_STANDARD 20)
+SET(CMAKE_CXX_STANDARD 23)
 SET(CMAKE_C_STANDARD 20)
 SET(CMAKE_CXX_EXTENSIONS OFF)
 SET(CMAKE_CXX_STANDARD_REQUIRED ON)
@@ -90,27 +92,35 @@ FUNCTION(capitalize IN OUT)
 ENDFUNCTION()
 
 SET(COMPONENTS
-    abs
-    add
-    baseConvert
-    subtract
-    multiply
-    decimalConvert
-    comparison
-    power
-    division
-    root
-    factorial
-    trig
-    hyp
-    log)
+    calc::abs
+    calc::add
+    base::baseConvert
+    calc::subtract
+    calc::multiply
+    base::decimalConvert
+    calc::comparison
+    calc::power
+    calc::division
+    calc::root
+    calc::factorial
+    calc::trig
+    calc::hyp
+    calc::log
+    calc::atan2
+)
 # NEW_COMPONENT: PATCH Do NOT remove the previous comment.
 
 SET(TARGETS ${COMPONENTS} util)
 SET(TEST_TARGETS_TEMP util fraction number factors format ${COMPONENTS})
 
 FOREACH(TEST_TARGET IN LISTS TEST_TARGETS_TEMP)
     SET(TARGET_NAME "test")
+    STRING(REPLACE "::" ";" COMPONENT_PARTS ${TEST_TARGET})
+    LIST(LENGTH COMPONENT_PARTS LEN)
+    IF(LEN EQUAL 2)
+        LIST(GET COMPONENT_PARTS 1 TEST_TARGET)
+    ENDIF()
+
     CAPITALIZE(${TEST_TARGET} FILE_NAME)
     STRING(CONCAT TARGET_NAME ${TARGET_NAME} ${FILE_NAME})
     LIST(APPEND TEST_TARGETS ${TARGET_NAME})

CMakeLists.txt

@@ -9,7 +9,7 @@ FUNCTION(ADD_GUI SOURCE)
     TARGET_INCLUDE_DIRECTORIES(${NAME} PRIVATE "${STP_BASE_DIRECTORY}/include/imgui")
 
     # Link Steppable stuff
-    TARGET_LINK_LIBRARIES(${NAME} PRIVATE calc impl)
+    TARGET_LINK_LIBRARIES(${NAME} PRIVATE func impl)
     TARGET_INCLUDE_DIRECTORIES(${NAME} PRIVATE ${STP_BASE_DIRECTORY}/include)
 
     if(FREETYPE_FOUND)

gui/CMakeLists.txt

@@ -32,9 +32,11 @@
  */
 
 #pragma once
+
 #include <cstdlib>
 #include <ctime>
 #include <filesystem>
+#include <mutex>
 
 using namespace std::literals;
 

include/platform.hpp

@@ -40,7 +40,7 @@ if(NOT ${STP_NO_BINDINGS}) # Only create the bindings if needed
         target_link_options(steppyble PRIVATE -Bsymbolic)
     endif()
     set_target_properties(steppyble PROPERTIES POSITION_INDEPENDENT_CODE ON)
-    target_link_libraries(steppyble PRIVATE calc steppable)
+    target_link_libraries(steppyble PRIVATE func steppable)
     target_compile_definitions(steppyble PRIVATE NO_MAIN)
     target_include_directories(steppyble PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../include)
-endif()
+endif()

lib/CMakeLists.txt

@@ -20,59 +20,56 @@
 #  SOFTWARE.                                                                                        #
 #####################################################################################################
 
-ADD_LIBRARY(util STATIC argParse.cpp colors.cpp logging.cpp symbols.cpp testing.cpp util.cpp getString.cpp platform.cpp format.cpp constants.cpp)
+ADD_LIBRARY(
+    util STATIC
+    argParse.cpp
+    colors.cpp
+    logging.cpp
+    symbols.cpp
+    testing.cpp
+    util.cpp
+    getString.cpp
+    platform.cpp
+    format.cpp
+    constants.cpp
+)
 SET_TARGET_PROPERTIES(util PROPERTIES POSITION_INDEPENDENT_CODE ON)
 
 ADD_LIBRARY(steppable STATIC number.cpp fraction.cpp)
 SET_TARGET_PROPERTIES(steppable PROPERTIES POSITION_INDEPENDENT_CODE ON)
 
 SET(CALCULATOR_FILES)
 
-FUNCTION(COPY_TO_BIN TARGET_NAME)
-    IF(DEFINED STP_BUILD_COMPONENT_EXECUTABLE)
-        IF(WINDOWS)
-            ADD_CUSTOM_COMMAND(
-                TARGET ${TARGET_NAME}
-                POST_BUILD
-                COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:${TARGET_NAME}>
-                        ${CMAKE_CURRENT_BINARY_DIR}/../bin/${TARGET_NAME}.exe
-            )
-        ELSE()
-            ADD_CUSTOM_COMMAND(
-                TARGET ${TARGET_NAME}
-                POST_BUILD
-                COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:${TARGET_NAME}>
-                        ${CMAKE_CURRENT_BINARY_DIR}/../bin/${TARGET_NAME}
-            )
-        ENDIF()
-    ENDIF()
-ENDFUNCTION()
-
 FOREACH(COMPONENT IN LISTS COMPONENTS)
-    MESSAGE(TRACE "Adding component: ${COMPONENT}: ${COMPONENT}/${COMPONENT}.cpp, ${COMPONENT}/${COMPONENT}Report.cpp")
+    STRING(REPLACE "::" ";" COMPONENT_PARTS ${COMPONENT})
+    LIST(LENGTH COMPONENT_PARTS LEN)
+    IF(NOT LEN EQUAL 2)
+        MESSAGE(FATAL_ERROR "Incorrect format of target name.")
+    ENDIF()
+    LIST(GET COMPONENT_PARTS 0 ORIGIN)
+    LIST(GET COMPONENT_PARTS 1 NAME)
+    SET(TARGET_NAME ${ORIGIN}_${NAME})
+    MESSAGE(TRACE "Adding component: ${NAME}: ${ORIGIN}/${NAME}/${NAME}.cpp, ${ORIGIN}/${NAME}/${NAME}Report.cpp")
 
     # No longer offering executables for each component automatically.
-    IF(DEFINED STP_BUILD_COMPONENT_EXECUTABLE)
-        ADD_EXECUTABLE(${COMPONENT} ${COMPONENT}/${COMPONENT}.cpp ${COMPONENT}/${COMPONENT}Report.cpp)
-        TARGET_INCLUDE_DIRECTORIES(${COMPONENT} PRIVATE ${STP_BASE_DIRECTORY}/include/)
-        TARGET_LINK_LIBRARIES(${COMPONENT} PRIVATE calc)
+    IF(STP_BUILD_COMPONENT_EXECUTABLE)
+        ADD_EXECUTABLE(${TARGET_NAME} ${ORIGIN}/${NAME}/${NAME}.cpp ${ORIGIN}/${NAME}/${NAME}Report.cpp)
+        TARGET_INCLUDE_DIRECTORIES(${TARGET_NAME} PRIVATE ${STP_BASE_DIRECTORY}/include/)
+        TARGET_LINK_LIBRARIES(${TARGET_NAME} PRIVATE func)
     ENDIF()
 
-    LIST(APPEND CALCULATOR_FILES ${CMAKE_CURRENT_SOURCE_DIR}/${COMPONENT}/${COMPONENT}.cpp
-         ${CMAKE_CURRENT_SOURCE_DIR}/${COMPONENT}/${COMPONENT}Report.cpp
-    )
-
-    COPY_TO_BIN(${COMPONENT})
+    LIST(APPEND CALCULATOR_FILES ${ORIGIN}/${NAME}/${NAME}.cpp ${ORIGIN}/${NAME}/${NAME}Report.cpp)
 ENDFOREACH()
 
-ADD_LIBRARY(calc STATIC ${CALCULATOR_FILES} fraction.cpp rounding.cpp factors.cpp number.cpp)
-SET_TARGET_PROPERTIES(calc PROPERTIES POSITION_INDEPENDENT_CODE ON)
+# FUNC: Library containing all Steppable functions.
+ADD_LIBRARY(func STATIC ${CALCULATOR_FILES} fraction.cpp rounding.cpp factors.cpp number.cpp)
+SET_TARGET_PROPERTIES(func PROPERTIES POSITION_INDEPENDENT_CODE ON)
 
 TARGET_INCLUDE_DIRECTORIES(steppable PRIVATE ${STP_BASE_DIRECTORY}/include/)
-TARGET_INCLUDE_DIRECTORIES(calc PRIVATE ${STP_BASE_DIRECTORY}/include/)
+TARGET_INCLUDE_DIRECTORIES(func PRIVATE ${STP_BASE_DIRECTORY}/include/)
 TARGET_INCLUDE_DIRECTORIES(util PRIVATE ${STP_BASE_DIRECTORY}/include/)
 
 TARGET_LINK_LIBRARIES(steppable PRIVATE util)
-TARGET_LINK_LIBRARIES(calc PRIVATE steppable)
-TARGET_COMPILE_DEFINITIONS(calc PRIVATE NO_MAIN)
+TARGET_LINK_LIBRARIES(func PRIVATE steppable)
+TARGET_COMPILE_DEFINITIONS(func PRIVATE NO_MAIN)
 TARGET_COMPILE_DEFINITIONS(steppable PRIVATE NO_MAIN)