Merge pull request #67 from OpenVicProject/format

Formating

2 files changed, 39 insertions, 55 deletions

diff --git a/src/openvic-simulation/misc/Define.cpp b/src/openvic-simulation/misc/Define.cpp
index 509b0a5..5e6a3cb 100644
--- a/src/openvic-simulation/misc/Define.cpp
+++ b/src/openvic-simulation/misc/Define.cpp
@@ -15,14 +15,8 @@
 using namespace OpenVic;
 using namespace OpenVic::NodeTools;
 
-Define::Define(
-	std::string_view new_identifier,
-	std::string&& new_value,
-	Type new_type
-) : HasIdentifier { new_identifier },
-	value { std::move(new_value) },
-	type { new_type } {
-}
+Define::Define(std::string_view new_identifier, std::string&& new_value, Type new_type)
+	: HasIdentifier { new_identifier }, value { std::move(new_value) }, type { new_type } {}
 
 fixed_point_t Define::get_value_as_fp() const {
 	return fixed_point_t::parse(value);
@@ -36,8 +30,7 @@ uint64_t Define::get_value_as_uint() const {
 	return std::strtoull(value.data(), nullptr, 10);
 }
 
-DefineManager::DefineManager() : defines { "defines" } {
-}
+DefineManager::DefineManager() : defines { "defines" } {}
 
 bool DefineManager::add_define(std::string_view name, std::string&& value, Define::Type type) {
 	return defines.add_item({ name, std::move(value), type }, duplicate_warning_callback);
@@ -52,14 +45,17 @@ const Date& DefineManager::get_end_date() const {
 }
 
 bool DefineManager::add_date_define(std::string_view name, Date date) {
-	if (name != "start_date" && name != "end_date") return false;
+	if (name != "start_date" && name != "end_date") {
+		return false;
+	}
 
 	bool ret = defines.add_item({ name, date.to_string(), Define::Type::None });
 
-	if (name == "start_date")
+	if (name == "start_date") {
 		start_date.reset(new Date(date));
-	else if (name == "end_date")
+	} else if (name == "end_date") {
 		end_date.reset(new Date(date));
+	}
 
 	return ret;
 }
@@ -67,7 +63,8 @@ bool DefineManager::add_date_define(std::string_view name, Date date) {
 bool DefineManager::load_defines_file(ast::NodeCPtr root) {
 	bool ret = expect_dictionary_keys(
 		"defines", ONE_EXACTLY, expect_dictionary([this](std::string_view key, ast::NodeCPtr value) -> bool {
-			if (key == "country" || key == "economy" || key == "military" || key == "diplomacy" || key == "pops" || key == "ai" || key == "graphics") {
+			if (key == "country" || key == "economy" || key == "military" || key == "diplomacy" ||
+				key == "pops" || key == "ai" || key == "graphics") {
 				return expect_dictionary([this, &key](std::string_view inner_key, ast::NodeCPtr value) -> bool {
 					std::string str_val;
 
@@ -76,30 +73,30 @@ bool DefineManager::load_defines_file(ast::NodeCPtr root) {
 					Define::Type type;
 					switch (key[0]) {
 						using enum Define::Type;
-						case 'c': // country
-							type = Country;
-							break;
-						case 'e': // economy
-							type = Economy;
-							break;
-						case 'm': // military
-							type = Military;
-							break;
-						case 'd': // diplomacy
-							type = Diplomacy;
-							break;
-						case 'p': // pops
-							type = Pops;
-							break;
-						case 'a': // ai
-							type = Ai;
-							break;
-						case 'g': // graphics
-							type = Graphics;
-							break;
-						default:
-							Logger::error("Unknown define type ", key, " found in defines!");
-							return false;
+					case 'c': // country
+						type = Country;
+						break;
+					case 'e': // economy
+						type = Economy;
+						break;
+					case 'm': // military
+						type = Military;
+						break;
+					case 'd': // diplomacy
+						type = Diplomacy;
+						break;
+					case 'p': // pops
+						type = Pops;
+						break;
+					case 'a': // ai
+						type = Ai;
+						break;
+					case 'g': // graphics
+						type = Graphics;
+						break;
+					default:
+						Logger::error("Unknown define type ", key, " found in defines!");
+						return false;
 					}
 
 					ret &= add_define(inner_key, std::move(str_val), type);
@@ -118,4 +115,4 @@ bool DefineManager::load_defines_file(ast::NodeCPtr root) {
 	)(root);
 	lock_defines();
 	return ret;
-}
\ No newline at end of file
+}
diff --git a/src/openvic-simulation/misc/Define.hpp b/src/openvic-simulation/misc/Define.hpp
index 9b768b7..0db9716 100644
--- a/src/openvic-simulation/misc/Define.hpp
+++ b/src/openvic-simulation/misc/Define.hpp
@@ -12,26 +12,13 @@ namespace OpenVic {
 	struct Define : HasIdentifier {
 		friend struct DefineManager;
 
-		enum class Type : unsigned char {
-			None,
-			Country,
-			Economy,
-			Military,
-			Diplomacy,
-			Pops,
-			Ai,
-			Graphics
-		};
+		enum class Type : unsigned char { None, Country, Economy, Military, Diplomacy, Pops, Ai, Graphics };
 
 	private:
 		std::string HASID_PROPERTY(value);
 		Type HASID_PROPERTY(type);
 
-		Define(
-			std::string_view new_identifier,
-			std::string&& new_value,
-			Type new_type
-		);
+		Define(std::string_view new_identifier, std::string&& new_value, Type new_type);
 
 	public:
 		Define(Define&&) = default;
@@ -60,4 +47,4 @@ namespace OpenVic {
 
 		bool load_defines_file(ast::NodeCPtr root);
 	};
-}
\ No newline at end of file
+}