Update tiny details.

DolphyWind · Nov 24, 2023 · f72d497 · f72d497
1 parent a6c70b7
commit f72d497
Show file tree

Hide file tree

Showing 7 changed files with 57 additions and 65 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.0.0)
+cmake_minimum_required(VERSION 3.15)
 set(CMAKE_CXX_STANDARD 17)
 
 if(NOT DEFINED CMAKE_BUILD_TYPE)

diff --git a/include/Electra.hpp b/include/Electra.hpp
@@ -34,12 +34,27 @@ SOFTWARE.
 #include <fstream>
 #include <sstream>
 #include <algorithm>
-#include <Logger.hpp>
 #include <tuple>
-#include <Printer.hpp>
 #include <stack>
-#include <ArithmeticalUnit.hpp>
 #include <cmath>
+#include <csignal>
+#include <regex>
+#include <codecvt>
+#include <stdexcept>
+#include <cstring>
+#if __has_include(<filesystem>)
+  #include <filesystem>
+  namespace fs = std::filesystem;
+#elif __has_include(<experimental/filesystem>)
+  #include <experimental/filesystem> 
+  namespace fs = std::experimental::filesystem;
+#else
+  #error "Missing the <filesystem> header."
+#endif
+
+#include <Logger.hpp>
+#include <Printer.hpp>
+#include <ArithmeticalUnit.hpp>
 #include <ConstantAdder.hpp>
 #include <Cloner.hpp>
 #include <ConstantPusher.hpp>
@@ -54,19 +69,6 @@ SOFTWARE.
 #include <Reader.hpp>
 #include <StackChecker.hpp>
 #include <StackSwitcher.hpp>
-#include <csignal>
-#include <regex>
-#include <codecvt>
-#include <stdexcept>
-#if __has_include(<filesystem>)
-  #include <filesystem>
-  namespace fs = std::filesystem;
-#elif __has_include(<experimental/filesystem>)
-  #include <experimental/filesystem> 
-  namespace fs = std::experimental::filesystem;
-#else
-  #error "Missing the <filesystem> header."
-#endif
 
 typedef std::vector<Direction> GeneratorData;
 
@@ -107,24 +109,17 @@ class Electra
     // Wstring converter
     static std::wstring_convert<std::codecvt_utf8<wchar_t>, wchar_t> wstring_converter;
 
-protected:
-    Electra() {}
 public:
+
     /// @brief Parses command line arguments, and initializes component and generators.
     /// 
     /// @param argc Command line argument count
     /// @param argv Command line arguments
-    void initialize(int argc, char* argv[]);
-
-    // Delete the copy constructor
-    Electra(const Electra&) = delete;
+    Electra(int argc, char** argv);
 
-    static Electra &instance();
+    ~Electra() = default;
 
-    /// @brief Clears components and generators
-    ~Electra();
-
-    /// @brief Runs the electra
+    /// @brief Runs the electra code.
     void run();
 
     /// @brief Recursively includes a file. 
@@ -154,9 +149,6 @@ class Electra
     /// - Create new currents
     void mainLoop();
 
-    /// @brief Safely exits the program
-    void safe_exit(int exit_code);
-
     // Methods for mainLoop() method.
     void moveCurrents();
     void generateGenerators();

diff --git a/include/Global.hpp b/include/Global.hpp
@@ -32,6 +32,7 @@ typedef double var_t;
 typedef std::stack<var_t>* StackPtr;
 typedef wchar_t char_t;
 
+class Electra;
 namespace Global
 {
     // Pops the top value of stack. Returns defaultValue if there is no item.
@@ -52,6 +53,8 @@ namespace Global
     // Replaces "lookFor" with "replaceWith" in "originalStr"
     std::wstring replaceString(std::wstring& originalStr, const std::wstring& lookFor, const std::wstring& replaceWith);
 
+    void safe_exit(int exit_code, int sig_code=-1);
+
     // Empty struct
     struct Empty{};
 }
diff --git a/src/Bomb.cpp b/src/Bomb.cpp
@@ -29,6 +29,6 @@ bool Bomb::work(CurrentPtr current, std::vector<CurrentPtr> *currentVector)
     if(!Component::work(current, currentVector))
         return false;
 
-    Electra::instance().safe_exit(0);
+    Global::safe_exit(0);
     return Cable::work(current, currentVector);
 }
diff --git a/src/Electra.cpp b/src/Electra.cpp
@@ -27,7 +27,7 @@ SOFTWARE.
 
 std::wstring_convert<std::codecvt_utf8<wchar_t>, wchar_t> Electra::wstring_converter;
 
-void Electra::initialize(int argc, char* argv[])
+Electra::Electra(int argc, char** argv)
 {
     // Get the current folder
     m_currentPath = fs::current_path();
@@ -55,21 +55,21 @@ void Electra::initialize(int argc, char* argv[])
     {
         parser.printHelpMessage();
         defaultlogger.log(LogType::INFO, L"Printed help message. Exiting with code 0.");
-        safe_exit(0);
+        Global::safe_exit(0);
     }
 
     if(bool_map["version"])
     {
         parser.printVersionMessage();
         defaultlogger.log(LogType::INFO, L"Printed current version of electra. Exiting with code 0.");
-        safe_exit(0);
+        Global::safe_exit(0);
     }
 
     if(alone_args.size() == 0)
     {
         parser.printHelpMessage();
         defaultlogger.log(LogType::INFO, L"No arguments specified. Printing help message. Exiting with code 1.");
-        safe_exit(1);
+        Global::safe_exit(1);
     }
 
     std::string stack_count_str = string_map["stack-count"];
@@ -94,13 +94,13 @@ void Electra::initialize(int argc, char* argv[])
     {
         defaultlogger.log(LogType::ERROR, L"\"{}\" is invalid for stack-count.\n");
         std::wcerr << L'\"' << std::to_wstring(stack_count_str) << L"\" is invalid for stack-count.\n";
-        safe_exit(1);
+        Global::safe_exit(1);
     }
     catch (const std::out_of_range &e)
     {
         defaultlogger.log(LogType::ERROR, L"\"{}\" is out of range for stack-count.", stack_count_str);
         std::wcerr << L'\"' << std::to_wstring(stack_count_str) << L"\" is out of range for stack-count." << std::endl;
-        safe_exit(1);
+        Global::safe_exit(1);
     }
 
     // Parses --stack argument
@@ -112,7 +112,7 @@ void Electra::initialize(int argc, char* argv[])
     {
         std::wcerr << L"You entered inital values for " << splitted_by_comma.size() << L" stacks but stack count is " << m_stacks.size() << L"!" << std::endl;
         defaultlogger.log(LogType::ERROR, L"You entered inital values for {} stacks but stack count is {}!", splitted_by_comma.size(), m_stacks.size());
-        safe_exit(1);
+        Global::safe_exit(1);
     }
     for(auto &splitted : splitted_by_comma)
     {
@@ -128,13 +128,13 @@ void Electra::initialize(int argc, char* argv[])
             {
                 defaultlogger.log(LogType::ERROR, L"The value {} is too big or small for var_t.", i);
                 std::wcerr << L"The value " << std::to_wstring(i) << L" is too big or small for var_t." << std::endl;
-                safe_exit(1);
+                Global::safe_exit(1);
             }
             catch(const std::invalid_argument &e)
             {
                 defaultlogger.log(LogType::ERROR, L"Can\'t convert {} to var_t.", i);
                 std::wcerr << L"Can\'t convert " << std::to_wstring(i) << L" to var_t." << std::endl;
-                safe_exit(1);
+                Global::safe_exit(1);
             }
         }
         index ++;
@@ -290,17 +290,6 @@ void Electra::initialize(int argc, char* argv[])
     #endif
 }
 
-Electra &Electra::instance()
-{
-    static Electra m_instance;
-    return m_instance;
-}
-
-Electra::~Electra()
-{
-
-}
-
 void Electra::run()
 {
     m_sourceCode = includeFile(m_currentPath, Electra::wstring_converter.from_bytes(m_filename));
@@ -331,19 +320,14 @@ void Electra::mainLoop()
     defaultlogger.log(LogType::INFO, L"Program finished. Total ticks: {}", tickCount);
 }
 
-void Electra::safe_exit(int exit_code)
-{
-    std::exit(exit_code);
-}
-
 std::vector<std::wstring> Electra::includeFile(fs::path currentPath, const std::wstring& filename, std::size_t start, std::size_t end, bool allow_reinclusion)
 {
     // Start cannot be greater then the end
     if(start >= end)
     {
         std::wcerr << L"Inclusion failed: Start index must be less than the end index." << std::endl;
         defaultlogger.log(LogType::ERROR, L"Inclusion failed: Start index must be less than the end index.");
-        safe_exit(1);
+        Global::safe_exit(1);
     }
 
     if(!allow_reinclusion)
@@ -385,7 +369,7 @@ std::vector<std::wstring> Electra::includeFile(fs::path currentPath, const std::
         {
             defaultlogger.log(LogType::ERROR, L"Cannot parse \"{}\". Source code contains tab character. Exiting with code 1.", filename);
             std::wcerr << "Error while reading file: Source code contains tab!" << std::endl;
-            safe_exit(1);
+            Global::safe_exit(1);
         }
 
         // Split by the new line and slice file according to given parameters
@@ -429,7 +413,7 @@ std::vector<std::wstring> Electra::includeFile(fs::path currentPath, const std::
                     {
                         std::wcerr << L"Cannot convert \"" << split_from_colon.at(0) << "\" to a number." << std::endl;
                         defaultlogger.log(LogType::ERROR, L"Cannot convert \"{}\" to a number.", split_from_colon.at(0));
-                        safe_exit(1);
+                        Global::safe_exit(1);
                     }
 
                     try
@@ -441,7 +425,7 @@ std::vector<std::wstring> Electra::includeFile(fs::path currentPath, const std::
                     {
                         std::wcerr << L"Cannot convert \"" << split_from_colon.at(1) << "\" to a number." << std::endl;
                         defaultlogger.log(LogType::ERROR, L"Cannot convert \"{}\" to a number.", split_from_colon.at(1));
-                        safe_exit(1);
+                        Global::safe_exit(1);
                     }
                 }
 
@@ -458,7 +442,7 @@ std::vector<std::wstring> Electra::includeFile(fs::path currentPath, const std::
     {
         std::wcerr << L"Cannot open \"" << filename << L"\"" << std::endl;
         defaultlogger.log(LogType::ERROR, L"Cannot open \"{}\". Exiting with code 1.", filename);
-        safe_exit(1);
+        Global::safe_exit(1);
     }
 
     return contents;
@@ -660,5 +644,5 @@ void Electra::createCurrents()
 
 void Electra::sigHandler(int signal)
 {
-    Electra::instance().safe_exit(0);
+    Global::safe_exit(1, signal);
 }
diff --git a/src/Global.cpp b/src/Global.cpp
@@ -23,6 +23,8 @@ SOFTWARE.
 */
 
 #include <Global.hpp>
+#include <Logger.hpp>
+#include <cstring>
 
 namespace Global
 {
@@ -101,4 +103,15 @@ namespace Global
 
         return originalStr.replace(pos, lookFor.length(), replaceWith);
     }
+
+    void safe_exit(int exit_code, int sig_code)
+    {
+        if(sig_code != -1)
+        {
+            defaultlogger.log(LogType::ERROR, L"Got signal {}. Exiting...", ::strsignal(sig_code));
+        }
+
+        std::exit(exit_code);
+    }
+
 } // namespace Global
diff --git a/src/main.cpp b/src/main.cpp
@@ -47,7 +47,7 @@ int main(int argc, char *argv[])
 	#endif
 	std::wcout << std::setprecision(15);
 
-	Electra::instance().initialize(argc, argv);
-	Electra::instance().run();
+	Electra electraInterpreter(argc, argv);
+	electraInterpreter.run();
 	return 0;
 }