mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-02 20:00:38 -06:00
Code Issues Packages Projects Releases Wiki Activity

source: Pass cmFileAPI::Object by value

Browse Source
This commit is contained in:
Daniel Pfeifer
2025-07-15 18:38:13 +02:00
committed by Brad King
parent 964e992ec5
commit 0bcb8d6e3c
2 changed files with 53 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
Source/cmFileAPI.cxx
View File

@@ -29,6 +29,20 @@
#include "cmTimestamp.h"
#include "cmake.h"
#if defined(__clang__) && defined(__has_warning)
# if __has_warning("-Wrange-loop-analysis")
# if defined(__apple_build_version__)
# if __apple_build_version__ < 13000000
# define CM_CLANG_SUPPRESS_WARN_RANGE_LOOP_ANALYSIS
# endif
# else
# if __clang_major__ < 11
# define CM_CLANG_SUPPRESS_WARN_RANGE_LOOP_ANALYSIS
# endif
# endif
# endif
#endif
cmFileAPI::cmFileAPI(cmake* cm)
: CMakeInstance(cm)
{
@@ -89,7 +103,14 @@ std::vector<unsigned int> cmFileAPI::GetConfigureLogVersions()
{
std::vector<unsigned int> versions;
auto getConfigureLogVersions = [&versions](Query const& q) {
for (Object const& o : q.Known) {
#ifdef CM_CLANG_SUPPRESS_WARN_RANGE_LOOP_ANALYSIS
# pragma clang diagnostic push
# pragma clang diagnostic ignored "-Wrange-loop-analysis"
#endif
for (Object const o : q.Known) {
#ifdef CM_CLANG_SUPPRESS_WARN_RANGE_LOOP_ANALYSIS
# pragma clang diagnostic pop
#endif
if (o.Kind == ObjectKind::ConfigureLog) {
versions.emplace_back(o.Version);
}
@@ -446,7 +467,14 @@ Json::Value cmFileAPI::BuildCMake()
Json::Value cmFileAPI::BuildReply(Query const& q)
{
Json::Value reply = Json::objectValue;
for (Object const& o : q.Known) {
#ifdef CM_CLANG_SUPPRESS_WARN_RANGE_LOOP_ANALYSIS
# pragma clang diagnostic push
# pragma clang diagnostic ignored "-Wrange-loop-analysis"
#endif
for (Object const o : q.Known) {
#ifdef CM_CLANG_SUPPRESS_WARN_RANGE_LOOP_ANALYSIS
# pragma clang diagnostic pop
#endif
std::string const& name = ObjectName(o);
reply[name] = this->BuildReplyEntry(o);
}
@@ -457,7 +485,7 @@ Json::Value cmFileAPI::BuildReply(Query const& q)
return reply;
}
Json::Value cmFileAPI::BuildReplyEntry(Object const& object)
Json::Value cmFileAPI::BuildReplyEntry(Object object)
{
if (this->ReplyIndexFor != IndexFor::Success) {
switch (object.Kind) {
@@ -481,7 +509,7 @@ Json::Value cmFileAPI::BuildReplyError(std::string const& error)
return e;
}
Json::Value const& cmFileAPI::AddReplyIndexObject(Object const& o)
Json::Value const& cmFileAPI::AddReplyIndexObject(Object o)
{
Json::Value& indexEntry = this->ReplyIndexObjects[o];
if (!indexEntry.isNull()) {
@@ -515,7 +543,7 @@ char const* cmFileAPI::ObjectKindName(ObjectKind kind)
return objectKindNames[static_cast<size_t>(kind)];
}
std::string cmFileAPI::ObjectName(Object const& o)
std::string cmFileAPI::ObjectName(Object o)
{
std::string name = cmStrCat(ObjectKindName(o.Kind), "-v", o.Version);
return name;
@@ -529,7 +557,7 @@ Json::Value cmFileAPI::BuildVersion(unsigned int major, unsigned int minor)
return version;
}
Json::Value cmFileAPI::BuildObject(Object const& object)
Json::Value cmFileAPI::BuildObject(Object object)
{
Json::Value value;
@@ -809,7 +837,7 @@ void cmFileAPI::BuildClientRequestCodeModel(
}
}
Json::Value cmFileAPI::BuildCodeModel(Object const& object)
Json::Value cmFileAPI::BuildCodeModel(Object object)
{
assert(object.Version == 2);
Json::Value codemodel =
@@ -846,7 +874,7 @@ void cmFileAPI::BuildClientRequestConfigureLog(
}
}
Json::Value cmFileAPI::BuildConfigureLog(Object const& object)
Json::Value cmFileAPI::BuildConfigureLog(Object object)
{
Json::Value configureLog = cmFileAPIConfigureLogDump(*this, object.Version);
configureLog["kind"] = this->ObjectKindName(object.Kind);
@@ -880,7 +908,7 @@ void cmFileAPI::BuildClientRequestCache(
}
}
Json::Value cmFileAPI::BuildCache(Object const& object)
Json::Value cmFileAPI::BuildCache(Object object)
{
Json::Value cache = cmFileAPICacheDump(*this, object.Version);
cache["kind"] = this->ObjectKindName(object.Kind);
@@ -914,7 +942,7 @@ void cmFileAPI::BuildClientRequestCMakeFiles(
}
}
Json::Value cmFileAPI::BuildCMakeFiles(Object const& object)
Json::Value cmFileAPI::BuildCMakeFiles(Object object)
{
Json::Value cmakeFiles = cmFileAPICMakeFilesDump(*this, object.Version);
cmakeFiles["kind"] = this->ObjectKindName(object.Kind);
@@ -948,7 +976,7 @@ void cmFileAPI::BuildClientRequestToolchains(
}
}
Json::Value cmFileAPI::BuildToolchains(Object const& object)
Json::Value cmFileAPI::BuildToolchains(Object object)
{
Json::Value toolchains = cmFileAPIToolchainsDump(*this, object.Version);
toolchains["kind"] = this->ObjectKindName(object.Kind);
@@ -984,7 +1012,7 @@ void cmFileAPI::BuildClientRequestInternalTest(
}
}
Json::Value cmFileAPI::BuildInternalTest(Object const& object)
Json::Value cmFileAPI::BuildInternalTest(Object object)
{
Json::Value test = Json::objectValue;
test["kind"] = this->ObjectKindName(object.Kind);

29
Source/cmFileAPI.h
View File

@@ -87,21 +87,18 @@ private:
{
ObjectKind Kind;
unsigned int Version = 0;
friend bool operator<(Object const& l, Object const& r)
friend bool operator<(Object l, Object r)
{
if (l.Kind != r.Kind) {
return l.Kind < r.Kind;
}
return l.Version < r.Version;
}
friend bool operator==(Object const& l, Object const& r)
friend bool operator==(Object l, Object r)
{
return l.Kind == r.Kind && l.Version == r.Version;
}
friend bool operator!=(Object const& l, Object const& r)
{
return !(l == r);
}
friend bool operator!=(Object l, Object r) { return !(l == r); }
};
/** Represent content of a query directory. */
@@ -192,14 +189,14 @@ private:
Json::Value BuildReplyIndex();
Json::Value BuildCMake();
Json::Value BuildReply(Query const& q);
Json::Value BuildReplyEntry(Object const& object);
Json::Value BuildReplyEntry(Object object);
static Json::Value BuildReplyError(std::string const& error);
Json::Value const& AddReplyIndexObject(Object const& o);
Json::Value const& AddReplyIndexObject(Object o);
static char const* ObjectKindName(ObjectKind kind);
static std::string ObjectName(Object const& o);
static std::string ObjectName(Object o);
Json::Value BuildObject(Object const& object);
Json::Value BuildObject(Object object);
ClientRequests BuildClientRequests(Json::Value const& requests);
ClientRequest BuildClientRequest(Json::Value const& request);
@@ -223,25 +220,25 @@ private:
void BuildClientRequestCodeModel(
ClientRequest& r, std::vector<RequestVersion> const& versions);
Json::Value BuildCodeModel(Object const& object);
Json::Value BuildCodeModel(Object object);
void BuildClientRequestConfigureLog(
ClientRequest& r, std::vector<RequestVersion> const& versions);
Json::Value BuildConfigureLog(Object const& object);
Json::Value BuildConfigureLog(Object object);
void BuildClientRequestCache(ClientRequest& r,
std::vector<RequestVersion> const& versions);
Json::Value BuildCache(Object const& object);
Json::Value BuildCache(Object object);
void BuildClientRequestCMakeFiles(
ClientRequest& r, std::vector<RequestVersion> const& versions);
Json::Value BuildCMakeFiles(Object const& object);
Json::Value BuildCMakeFiles(Object object);
void BuildClientRequestToolchains(
ClientRequest& r, std::vector<RequestVersion> const& versions);
Json::Value BuildToolchains(Object const& object);
Json::Value BuildToolchains(Object object);
void BuildClientRequestInternalTest(
ClientRequest& r, std::vector<RequestVersion> const& versions);
Json::Value BuildInternalTest(Object const& object);
Json::Value BuildInternalTest(Object object);
};