Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-20 00:51:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add braces to C++ single-line loops and conditionals (NFC) (#2973)

Browse Source 
This makes code easier to read and more consistent between C++ and Java.
Also update clang-format settings to always add a line break (even if no braces are used).
This commit is contained in:
Peter Johnson
2020-12-28 12:58:06 -08:00
committed by GitHub
parent 0291a3ff56
commit 2aed432b4b
634 changed files with 10716 additions and 3938 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
ntcore/src/main/native/cpp/Value.cpp
View File

@@ -19,25 +19,28 @@ Value::Value() {
Value::Value(NT_Type type, uint64_t time, const private_init&) {
m_val.type = type;
if (time == 0)
if (time == 0) {
m_val.last_change = wpi::Now();
else
} else {
m_val.last_change = time;
if (m_val.type == NT_BOOLEAN_ARRAY)
}
if (m_val.type == NT_BOOLEAN_ARRAY) {
m_val.data.arr_boolean.arr = nullptr;
else if (m_val.type == NT_DOUBLE_ARRAY)
} else if (m_val.type == NT_DOUBLE_ARRAY) {
m_val.data.arr_double.arr = nullptr;
else if (m_val.type == NT_STRING_ARRAY)
} else if (m_val.type == NT_STRING_ARRAY) {
m_val.data.arr_string.arr = nullptr;
}
}
Value::~Value() {
if (m_val.type == NT_BOOLEAN_ARRAY)
if (m_val.type == NT_BOOLEAN_ARRAY) {
delete[] m_val.data.arr_boolean.arr;
else if (m_val.type == NT_DOUBLE_ARRAY)
} else if (m_val.type == NT_DOUBLE_ARRAY) {
delete[] m_val.data.arr_double.arr;
else if (m_val.type == NT_STRING_ARRAY)
} else if (m_val.type == NT_STRING_ARRAY) {
delete[] m_val.data.arr_string.arr;
}
}
std::shared_ptr<Value> Value::MakeBooleanArray(wpi::ArrayRef<bool> value,
@@ -137,8 +140,9 @@ void nt::ConvertToC(const Value& in, NT_Value* out) {
auto v = in.GetStringArray();
out->data.arr_string.arr = static_cast<NT_String*>(
wpi::safe_malloc(v.size() * sizeof(NT_String)));
for (size_t i = 0; i < v.size(); ++i)
for (size_t i = 0; i < v.size(); ++i) {
ConvertToC(v[i], &out->data.arr_string.arr[i]);
}
out->data.arr_string.size = v.size();
break;
}
@@ -179,8 +183,9 @@ std::shared_ptr<Value> nt::ConvertFromC(const NT_Value& value) {
case NT_STRING_ARRAY: {
std::vector<std::string> v;
v.reserve(value.data.arr_string.size);
for (size_t i = 0; i < value.data.arr_string.size; ++i)
for (size_t i = 0; i < value.data.arr_string.size; ++i) {
v.push_back(ConvertFromC(value.data.arr_string.arr[i]));
}
return Value::MakeStringArray(std::move(v));
}
default:
@@ -190,7 +195,9 @@ std::shared_ptr<Value> nt::ConvertFromC(const NT_Value& value) {
}
bool nt::operator==(const Value& lhs, const Value& rhs) {
if (lhs.type() != rhs.type()) return false;
if (lhs.type() != rhs.type()) {
return false;
}
switch (lhs.type()) {
case NT_UNASSIGNED:
return true; // XXX: is this better being false instead?
@@ -203,15 +210,17 @@ bool nt::operator==(const Value& lhs, const Value& rhs) {
case NT_RPC:
return lhs.m_string == rhs.m_string;
case NT_BOOLEAN_ARRAY:
if (lhs.m_val.data.arr_boolean.size != rhs.m_val.data.arr_boolean.size)
if (lhs.m_val.data.arr_boolean.size != rhs.m_val.data.arr_boolean.size) {
return false;
}
return std::memcmp(lhs.m_val.data.arr_boolean.arr,
rhs.m_val.data.arr_boolean.arr,
lhs.m_val.data.arr_boolean.size *
sizeof(lhs.m_val.data.arr_boolean.arr[0])) == 0;
case NT_DOUBLE_ARRAY:
if (lhs.m_val.data.arr_double.size != rhs.m_val.data.arr_double.size)
if (lhs.m_val.data.arr_double.size != rhs.m_val.data.arr_double.size) {
return false;
}
return std::memcmp(lhs.m_val.data.arr_double.arr,
rhs.m_val.data.arr_double.arr,
lhs.m_val.data.arr_double.size *