Hendrik/xgboost
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add noexcept to JSON objects. (#7205)

Browse Source
This commit is contained in:
Jiaming Yuan 2021-09-07 13:56:48 +08:00 committed by GitHub
parent 3a4f51f39f
commit b12e7f7edd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
include/xgboost/json.h
View File

@ -82,7 +82,7 @@ class JsonString : public Value {
JsonString() : Value(ValueKind::kString) {} JsonString() : Value(ValueKind::kString) {}
JsonString(std::string const& str) : // NOLINT JsonString(std::string const& str) : // NOLINT
Value(ValueKind::kString), str_{str} {} Value(ValueKind::kString), str_{str} {}
JsonString(std::string&& str) : // NOLINT JsonString(std::string&& str) noexcept : // NOLINT
Value(ValueKind::kString), str_{std::move(str)} {} Value(ValueKind::kString), str_{std::move(str)} {}
JsonString(JsonString&& str) noexcept : // NOLINT JsonString(JsonString&& str) noexcept : // NOLINT
Value(ValueKind::kString), str_{std::move(str.str_)} {} Value(ValueKind::kString), str_{std::move(str.str_)} {}
@ -109,12 +109,12 @@ class JsonArray : public Value {
public: public:
JsonArray() : Value(ValueKind::kArray) {} JsonArray() : Value(ValueKind::kArray) {}
JsonArray(std::vector<Json>&& arr) : // NOLINT JsonArray(std::vector<Json>&& arr) noexcept : // NOLINT
Value(ValueKind::kArray), vec_{std::move(arr)} {} Value(ValueKind::kArray), vec_{std::move(arr)} {}
JsonArray(std::vector<Json> const& arr) : // NOLINT JsonArray(std::vector<Json> const& arr) : // NOLINT
Value(ValueKind::kArray), vec_{arr} {} Value(ValueKind::kArray), vec_{arr} {}
JsonArray(JsonArray const& that) = delete; JsonArray(JsonArray const& that) = delete;
JsonArray(JsonArray && that); JsonArray(JsonArray && that) noexcept;
void Save(JsonWriter* writer) override; void Save(JsonWriter* writer) override;
@ -138,9 +138,9 @@ class JsonObject : public Value {
public: public:
JsonObject() : Value(ValueKind::kObject) {} JsonObject() : Value(ValueKind::kObject) {}
JsonObject(std::map<std::string, Json>&& object); // NOLINT JsonObject(std::map<std::string, Json>&& object) noexcept; // NOLINT
JsonObject(JsonObject const& that) = delete; JsonObject(JsonObject const& that) = delete;
JsonObject(JsonObject && that); JsonObject(JsonObject && that) noexcept;
void Save(JsonWriter* writer) override; void Save(JsonWriter* writer) override;
@ -419,9 +419,9 @@ class Json {
Json(Json const& other) = default; Json(Json const& other) = default;
Json& operator=(Json const& other); Json& operator=(Json const& other);
// move // move
Json(Json&& other) : ptr_{std::move(other.ptr_)} {} Json(Json &&other) noexcept { std::swap(this->ptr_, other.ptr_); }
Json& operator=(Json&& other) { Json &operator=(Json &&other) noexcept {
ptr_ = std::move(other.ptr_); std::swap(this->ptr_, other.ptr_);
return *this; return *this;
} }

13
src/common/json.cc
View File

@ -169,10 +169,10 @@ Json& DummyJsonObject() {
} }
// Json Object // Json Object
JsonObject::JsonObject(JsonObject && that) : JsonObject::JsonObject(JsonObject && that) noexcept :
Value(ValueKind::kObject), object_{std::move(that.object_)} {} Value(ValueKind::kObject), object_{std::move(that.object_)} {}
JsonObject::JsonObject(std::map<std::string, Json>&& object) JsonObject::JsonObject(std::map<std::string, Json> &&object) noexcept
: Value(ValueKind::kObject), object_{std::move(object)} {} : Value(ValueKind::kObject), object_{std::move(object)} {}
Json& JsonObject::operator[](std::string const & key) { Json& JsonObject::operator[](std::string const & key) {
@ -233,7 +233,7 @@ void JsonString::Save(JsonWriter* writer) {
} }
// Json Array // Json Array
JsonArray::JsonArray(JsonArray && that) : JsonArray::JsonArray(JsonArray && that) noexcept :
Value(ValueKind::kArray), vec_{std::move(that.vec_)} {} Value(ValueKind::kArray), vec_{std::move(that.vec_)} {}
Json& JsonArray::operator[](std::string const& ) { Json& JsonArray::operator[](std::string const& ) {
@ -406,7 +406,7 @@ Json JsonReader::Parse() {
Error("Unknown construct"); Error("Unknown construct");
} }
} }
return Json(); return {};
} }
Json JsonReader::Load() { Json JsonReader::Load() {
@ -751,4 +751,9 @@ std::ostream &operator<<(std::ostream &os, StringView const v) {
} }
return os; return os;
} }
static_assert(std::is_nothrow_move_constructible<Json>::value, "");
static_assert(std::is_nothrow_move_constructible<Object>::value, "");
static_assert(std::is_nothrow_move_constructible<Array>::value, "");
static_assert(std::is_nothrow_move_constructible<String>::value, "");
} // namespace xgboost } // namespace xgboost

1
tests/cpp/common/test_json.cc
View File

@ -332,6 +332,7 @@ TEST(Json, AssigningObjects) {
auto str = JsonString("1"); auto str = JsonString("1");
auto& k = json_object["1"]; auto& k = json_object["1"];
k = std::move(str); k = std::move(str);
ASSERT_TRUE(str.GetString().empty()); // NOLINT
auto& m = json_object["1"]; auto& m = json_object["1"];
std::string value = get<JsonString>(m); std::string value = get<JsonString>(m);
ASSERT_EQ(value, "1"); ASSERT_EQ(value, "1");