Add initialization lists

Author: eagerbeaver04

Calculator.cpp

@@ -3,8 +3,8 @@
 
 int main(int argc, char** argv)
 {
-	std::string folder = "./plugins";//for Visual Studio
-	//std::string folder = "..\\plugins";//for Cmake project
+	//std::string folder = "./plugins";//for Visual Studio
+	std::string folder = "..\\plugins";//for Cmake project
 	std::string extension = ".dll";
 	Calculator app(folder, extension);
 	while (true)

Calculator.h

@@ -12,12 +12,9 @@ class Calculator
 
 
 public:
-	Calculator(const std::string& folder, const std::string& extension)
-	{
-		this->parser = std::make_unique<Parser>(folder, extension);
-		this->input = "";
-		this->output = "";
-	};
+	Calculator(const std::string& folder, const std::string& extension) : 
+		parser(std::make_unique<Parser>(folder, extension)), input(""), output("") {};
+
 	~Calculator() = default;
 	Calculator() = default;
 	Calculator(const Calculator&) = default;

Loader.cpp

@@ -1,6 +1,6 @@
 #include "Loader.h"
 
-std::unique_ptr<Operator> Loader::getOperatorFromDll(const HINSTANCE& load)
+void Loader::getOperatorFromDll(std::map<std::string, std::unique_ptr<Operator>>& operations, const HINSTANCE& load)
 {
 
 	std::function<double(double, double)> Operation = (double (*) (double, double))GetProcAddress(load, "operation");
@@ -9,12 +9,10 @@ std::unique_ptr<Operator> Loader::getOperatorFromDll(const HINSTANCE& load)
 	std::function<std::string(void)> Name = (std::string(*) (void)) GetProcAddress(load, "name");
 	std::function<bool(void)>  Associativity = (bool (*) (void))GetProcAddress(load, "associativity");
 
-	std::unique_ptr<Operator> op = std::make_unique<Operator>(Name(), Priority(), Associativity(), Binary(), Operation);
-
-	return op;
+	operations[Name()] = std::move(std::make_unique<Operator>(Name(), Priority(), Associativity(), Binary(), Operation));
 }
 
-void Loader::loadDll(std::map<std::string, std::unique_ptr<Operator>>& operation_list, const std::string& folder, const std::string& extension)
+void Loader::loadDll(std::map<std::string, std::unique_ptr<Operator>>& operations, const std::string& folder, const std::string& extension)
 {
 	std::vector<std::filesystem::path> files;
 
@@ -32,12 +30,8 @@ void Loader::loadDll(std::map<std::string, std::unique_ptr<Operator>>& operation
 		this->libraries.push_back(load);
 
 		if (load)
-		{
-			std::unique_ptr<Operator> op = getOperatorFromDll(load);
-			operation_list[op->getName()] = std::move(op);
-			continue;
-		}
-
+			getOperatorFromDll(operations, load);
+		else
 		std::cerr << "Opening dll file " << path << " failure" << std::endl;
 	}
 

Loader.h

@@ -16,13 +16,7 @@ class Loader
 	std::string extension;
 
 public:
-	Loader(const std::string& folder, const std::string& extension)
-	{
-		this->libraries;
-		this->folder = folder;
-		this->extension = extension;
-	}
-
+	Loader(const std::string& folder, const std::string& extension) : libraries({}), folder(folder), extension(extension) {};
 	Loader() = default;
 	Loader(const Loader&) = default;
 	Loader(Loader&&) = default;
@@ -35,7 +29,7 @@ class Loader
 			FreeLibrary(lib);
 		libraries.clear();
 	}
-	std::unique_ptr<Operator> getOperatorFromDll(const HINSTANCE& load);
+	void getOperatorFromDll(std::map<std::string, std::unique_ptr<Operator>>& operations, const HINSTANCE& load);
 	void loadDll(std::map<std::string, std::unique_ptr<Operator>>& operations, const std::string& folder, const std::string& extension);
 
 };

Operations.h

@@ -26,7 +26,7 @@ class Operations
 			this->loader.loadDll(this->operations, folder, extension);
 		}
 		else
-			std::cout << std::endl << "Folder for extra operations is not download" << std::endl;
+			std::cerr << std::endl << "Folder for extra operations is not download" << std::endl;
 	};
 
 	int getPriority(const std::string& symbol);

Operator.h

@@ -8,14 +8,10 @@
 class Operator
 {
 public:
-	Operator(const std::string& name, int priority, bool associativity, int binary, std::function<double(double, double)> operation)
-	{
-		this->name = name;
-		this->priority = priority;
-		this->operation = operation;
-		this->associativity = associativity;
-		this->binary = binary;
-	}
+	Operator(const std::string& name, int priority, bool associativity,
+		int binary, const std::function<double(double, double)>& operation)
+		: name(name), priority(priority), associativity(associativity), binary(binary), operation(operation) {};
+
 	Operator() = default;
 	~Operator() = default;
 	Operator(const Operator& A) = default;