Require bracing on single line if statements using clang format

Author: LinuxDevon

.clang-format

@@ -44,6 +44,8 @@ BraceWrapping:
     AfterClass: false
     AfterCaseLabel: false
 
+InsertBraces: true
+
 # CrlInstruction *a;
 DerivePointerAlignment: false
 PointerAlignment: Left

src/dbc.cpp

@@ -43,20 +43,25 @@ bool parseVal(const std::string& str, VALObject& obj) {
 	for (;;) {
 		switch (state) {
 		case Identifier: {
-			if (*a != 'V')
+			if (*a != 'V') {
 				return false;
+			}
 			a++;
-			if (*a != 'A')
+			if (*a != 'A') {
 				return false;
+			}
 			a++;
-			if (*a != 'L')
+			if (*a != 'L') {
 				return false;
+			}
 			a++;
-			if (*a != '_')
+			if (*a != '_') {
 				return false;
+			}
 			a++;
-			if (*a != ' ')
+			if (*a != ' ') {
 				return false;
+			}
 			a++; // skip whitespace
 			state = CANId;
 			break;
@@ -67,27 +72,31 @@ bool parseVal(const std::string& str, VALObject& obj) {
 				can_id_str += *a;
 				a++;
 			}
-			if (can_id_str.empty())
+			if (can_id_str.empty()) {
 				return false;
+			}
 			obj.can_id = static_cast<uint32_t>(std::stoul(can_id_str));
-			if (*a != ' ')
+			if (*a != ' ') {
 				return false;
+			}
 			a++; // skip whitespace
 			state = SignalName;
 			break;
 		}
 		case SignalName: {
-			if ((*a >= 'a' && *a <= 'z') || (*a >= 'A' && *a <= 'Z') || *a == '_')
+			if ((*a >= 'a' && *a <= 'z') || (*a >= 'A' && *a <= 'Z') || *a == '_') {
 				obj.signal_name += *a;
-			else
+			} else {
 				return false;
+			}
 			a++;
 			while ((*a >= 'a' && *a <= 'z') || (*a >= 'A' && *a <= 'Z') || *a == '_' || (*a >= '0' && *a <= '9')) {
 				obj.signal_name += *a;
 				a++;
 			}
-			if (*a != ' ')
+			if (*a != ' ') {
 				return false;
+			}
 			a++; // skip whitespace
 			state = Value;
 			break;
@@ -99,34 +108,40 @@ bool parseVal(const std::string& str, VALObject& obj) {
 				a++;
 			}
 			if (*a == ';') {
-				if (value_str.empty())
+				if (value_str.empty()) {
 					return true;
+				}
 				return false;
 			}
-			if (value_str.empty())
+			if (value_str.empty()) {
 				return false;
+			}
 
-			if (*a != ' ')
+			if (*a != ' ') {
 				return false;
+			}
 			a++; // skip whitespace
 			vd.value = (uint32_t)std::stoul(value_str);
 			state = Description;
 			break;
 		}
 		case Description: {
 			std::string desc;
-			if (*a != '"')
+			if (*a != '"') {
 				return false;
+			}
 			a++;
 			while (*a != '"' && *a != 0) {
 				desc += *a;
 				a++;
 			}
-			if (*a == 0)
+			if (*a == 0) {
 				return false;
+			}
 			a++;
-			if (*a != ' ')
+			if (*a != ' ') {
 				return false;
+			}
 			a++; // skip whitespace
 
 			vd.description = desc;
@@ -188,8 +203,9 @@ std::vector<libdbc::Message> DbcParser::get_messages() const {
 
 Message::ParseSignalsStatus DbcParser::parseMessage(const uint32_t id, const std::vector<uint8_t>& data, std::vector<double>& out_values) {
 	for (const auto& message : messages) {
-		if (message.id() == id)
+		if (message.id() == id) {
 			return message.parseSignals(data, out_values);
+		}
 	}
 	return Message::ParseSignalsStatus::ErrorUnknownID;
 }
@@ -212,8 +228,9 @@ void DbcParser::parse_dbc_header(std::istream& file_stream) {
 
 	utils::StreamHandler::get_next_non_blank_line(file_stream, line);
 
-	if (!std::regex_search(line, match, bit_timing_re))
+	if (!std::regex_search(line, match, bit_timing_re)) {
 		throw validity_error();
+	}
 }
 
 void DbcParser::parse_dbc_nodes(std::istream& file_stream) {
@@ -222,8 +239,9 @@ void DbcParser::parse_dbc_nodes(std::istream& file_stream) {
 
 	utils::StreamHandler::get_next_non_blank_line(file_stream, line);
 
-	if (!std::regex_search(line, match, node_re))
+	if (!std::regex_search(line, match, node_re)) {
 		throw validity_error();
+	}
 
 	if (match.length() > 2) {
 		std::string n = match.str(2);

src/message.cpp

@@ -16,8 +16,9 @@ bool Message::operator==(const Message& rhs) const {
 
 Message::ParseSignalsStatus Message::parseSignals(const std::vector<uint8_t>& data, std::vector<double>& values) const {
 	auto size = data.size();
-	if (size > 8)
+	if (size > 8) {
 		return ParseSignalsStatus::ErrorMessageToLong; // not supported yet
+	}
 
 	uint64_t data_little_endian = 0;
 	uint64_t data_big_endian = 0;
@@ -35,8 +36,9 @@ Message::ParseSignalsStatus Message::parseSignals(const std::vector<uint8_t>& da
 			uint32_t start_bit = 8 * (signal.start_bit / 8) + (7 - (signal.start_bit % 8)); // Calculation taken from python CAN
 			v = data_big_endian << start_bit;
 			v = v >> (len - signal.size);
-		} else
+		} else {
 			v = data_little_endian >> signal.start_bit;
+		}
 
 		if (signal.is_signed && signal.size > 1) {
 			switch (signal.size) {
@@ -56,10 +58,11 @@ Message::ParseSignalsStatus Message::parseSignals(const std::vector<uint8_t>& da
 				// 2 complement -> decimal
 				const int negative = (v & (1ull << (signal.size - 1))) != 0;
 				int64_t nativeInt;
-				if (negative)
+				if (negative) {
 					nativeInt = static_cast<int64_t>(v | ~((1ull << signal.size) - 1)); // invert all bits above signal.size
-				else
+				} else {
 					nativeInt = static_cast<int64_t>(v & ((1ull << signal.size) - 1)); // masking
+				}
 				values.push_back(static_cast<double>(nativeInt) * signal.factor + signal.offset);
 				break;
 			}

src/signal.cpp

@@ -47,8 +47,9 @@ std::ostream& operator<<(std::ostream& out, const Signal& sig) {
 	out << "Min: " << sig.min << ", Max: " << sig.max << ", ";
 	out << "Unit: (" << sig.unit << "), ";
 	out << "receivers: ";
-	for (const auto& r : sig.receivers)
+	for (const auto& r : sig.receivers) {
 		out << r;
+	}
 	return out << "}";
 }
 }