add stuff

Author: AzizZayed

.clang-tidy

@@ -97,7 +97,7 @@ modernize-use-bool-literals,
 modernize-use-emplace,
 modernize-use-equals-default,
 modernize-use-equals-delete,
-# modernize-use-nodiscard,
+modernize-use-nodiscard,
 modernize-use-noexcept,
 modernize-use-nullptr,
 modernize-use-override,

.gitignore

@@ -13,6 +13,7 @@ _deps
 
 cmake-build-*/
 build-*/
+builds/
 *_include.cmake
 bin/
 

CMakeLists.txt

@@ -19,6 +19,7 @@ if (CMAKE_BUILD_TYPE MATCHES Debug)
     endif()
 
     # Enable ASAN and UBSAN
+    # TODO: Fix sanitizers for Windows and Linux
     if (MSVC)
         add_compile_options(/fsanitize=address,undefined)
         add_link_options(/fsanitize=address,undefined)

build.bat

@@ -17,10 +17,10 @@ IF "%#%" "-eq" "0" (
 )
 
 IF "%build_debug%" "-eq" "1" (
-  cmake "-DCMAKE_BUILD_TYPE=Debug" "-S" "." "-B" "build-debug"
-  cmake "--build" "build-debug"
+  cmake "-DCMAKE_BUILD_TYPE=Debug" "-S" "." "-B" "builds/debug"
+  cmake "--build" "builds/debug"
 )
 IF "%build_release%" "-eq" "1" (
-  cmake "-DCMAKE_BUILD_TYPE=Release" "-S" "." "-B" "build-release"
-  cmake "--build" "build-release"
+  cmake "-DCMAKE_BUILD_TYPE=Release" "-S" "." "-B" "builds/release"
+  cmake "--build" "builds/release"
 )

build.sh

@@ -28,12 +28,12 @@ fi
 
 # Build the debug version if specified
 if [ $build_debug -eq 1 ]; then
-  cmake -DCMAKE_BUILD_TYPE=Debug -S . -B build-debug
-  cmake --build build-debug
+  cmake -DCMAKE_BUILD_TYPE=Debug -S . -B builds/debug
+  cmake --build builds/debug
 fi
 
 # Build the release version if specified
 if [ $build_release -eq 1 ]; then
-  cmake -DCMAKE_BUILD_TYPE=Release -S . -B build-release
-  cmake --build build-release
+  cmake -DCMAKE_BUILD_TYPE=Release -S . -B builds/release
+  cmake --build builds/release
 fi

cas/include/cas/data/ExpressionProperties.h

@@ -26,7 +26,7 @@ class LatexRenderer {
 
 private:
     const std::string prefix = "lr_";
-    const std::string resFolder = "../res/latex";
+    const std::string resFolder = "../../res/latex";
 };
 
 CAS_NAMESPACE_END

cas/include/cas/latex/LatexRenderer.h

@@ -7,12 +7,27 @@
 
 #include "IMath.h"
 #include "IRepresentableMath.h"
-#include "cas/data/ExpressionProperties.h"
 #include "cas/data/ExpressionType.h"
 #include <memory>
 
 CAS_NAMESPACE
 
+struct ExpressionProperties {
+public:
+   ExpressionProperties(ExpressionType type, std::string name, std::string shortName)
+        : order(static_cast<uint8_t>(type)), type(type), name(std::move(name)), shortName(std::move(shortName)) {}
+
+    uint16_t order;
+    ExpressionType type;
+    std::string name;
+    std::string shortName;
+
+    uint16_t getOrder() const { return order; }
+    ExpressionType getType() const { return type; }
+    std::string getName() const { return name; }
+    std::string getShortName() const { return shortName; }
+};
+
 class Const;
 class Var;
 

cas/include/cas/node/Expression.h

@@ -12,7 +12,7 @@ CAS_NAMESPACE
 class Function : public IMath<Function*>, public IRepresentableMath {
 public:
     explicit Function(std::string strFunction, const std::string& name = "z", bool simplify = true);
-    ~Function() = default;
+    virtual ~Function() = default;
 
     double evaluate(const VariableMap& vars) override;
     Function* derivative(char var) override;

cas/include/cas/plot/Function.h

@@ -10,16 +10,6 @@
 #include <locale>
 #include <vector>
 
-inline std::wstring toWstring(const std::string& string) {
-    std::wstring_convert<std::codecvt_utf8<wchar_t>> converter;
-    return converter.from_bytes(string);
-}
-
-inline std::string toString(const std::wstring& wString) {
-    std::wstring_convert<std::codecvt_utf8<wchar_t>> converter;
-    return converter.to_bytes(wString);
-}
-
 inline void replaceAll(std::string& str, const std::string& from, const std::string& to) {
     size_t start_pos = 0;
     while ((start_pos = str.find(from, start_pos)) != std::string::npos) {