octoleo/qpdf
2
1
Fork 0
mirror of https://github.com/qpdf/qpdf.git synced 2024-12-22 10:58:58 +00:00
Code Issues Releases Wiki Activity

Change JSON::Members::value to std::unique_ptr

Browse Source
This commit is contained in:
m-holger 2023-02-05 18:53:55 +00:00
parent a4f3dddb79
commit 7ae1e80fd6
2 changed files with 19 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/qpdf/JSON.hh
View File

@ -425,7 +425,7 @@ class JSON
std::function<void(Pipeline*)> fn;
};
JSON(std::shared_ptr<JSON_value>);
JSON(std::unique_ptr<JSON_value>);
static bool checkSchemaInternal(
JSON_value* this_v,
@ -443,13 +443,13 @@ class JSON
~Members() = default;
private:
Members(std::shared_ptr<JSON_value>);
Members(std::unique_ptr<JSON_value>);
Members(Members const&) = delete;
std::shared_ptr<JSON_value> value;
std::unique_ptr<JSON_value> value;
// start and end are only populated for objects created by parse
qpdf_offset_t start;
qpdf_offset_t end;
qpdf_offset_t start{0};
qpdf_offset_t end{0};
};
std::shared_ptr<Members> m;

30
libqpdf/JSON.cc
View File

@ -9,15 +9,13 @@
#include <cstring>
#include <stdexcept>
JSON::Members::Members(std::shared_ptr<JSON_value> value) :
value(value),
start(0),
end(0)
JSON::Members::Members(std::unique_ptr<JSON_value> value) :
value(std::move(value))
{
}
JSON::JSON(std::shared_ptr<JSON_value> value) :
m(new Members(value))
JSON::JSON(std::unique_ptr<JSON_value> value) :
m(new Members(std::move(value)))
{
}
@ -278,7 +276,7 @@ JSON::encode_string(std::string const& str)
JSON
JSON::makeDictionary()
{
return JSON(std::make_shared<JSON_dictionary>());
return JSON(std::make_unique<JSON_dictionary>());
}
JSON
@ -286,7 +284,7 @@ JSON::addDictionaryMember(std::string const& key, JSON const& val)
{
if (auto* obj = dynamic_cast<JSON_dictionary*>(this->m->value.get())) {
return obj->members[encode_string(key)] =
val.m->value ? val.m->value : std::make_shared<JSON_null>();
val.m->value ? val : makeNull();
} else {
throw std::runtime_error(
"JSON::addDictionaryMember called on non-dictionary");
@ -311,7 +309,7 @@ JSON::checkDictionaryKeySeen(std::string const& key)
JSON
JSON::makeArray()
{
return JSON(std::make_shared<JSON_array>());
return JSON(std::make_unique<JSON_array>());
}
JSON
@ -332,43 +330,43 @@ JSON::addArrayElement(JSON const& val)
JSON
JSON::makeString(std::string const& utf8)
{
return JSON(std::make_shared<JSON_string>(utf8));
return JSON(std::make_unique<JSON_string>(utf8));
}
JSON
JSON::makeInt(long long int value)
{
return JSON(std::make_shared<JSON_number>(value));
return JSON(std::make_unique<JSON_number>(value));
}
JSON
JSON::makeReal(double value)
{
return JSON(std::make_shared<JSON_number>(value));
return JSON(std::make_unique<JSON_number>(value));
}
JSON
JSON::makeNumber(std::string const& encoded)
{
return JSON(std::make_shared<JSON_number>(encoded));
return JSON(std::make_unique<JSON_number>(encoded));
}
JSON
JSON::makeBool(bool value)
{
return JSON(std::make_shared<JSON_bool>(value));
return JSON(std::make_unique<JSON_bool>(value));
}
JSON
JSON::makeNull()
{
return JSON(std::make_shared<JSON_null>());
return JSON(std::make_unique<JSON_null>());
}
JSON
JSON::makeBlob(std::function<void(Pipeline*)> fn)
{
return JSON(std::make_shared<JSON_blob>(fn));
return JSON(std::make_unique<JSON_blob>(fn));
}
bool