dilim/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-08-04 14:50:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

cmVariableWatch: Use enum for access type

Browse Source 
Adjust variable watches to pass the access type as the `enum` rather
than as an `int`.
This commit is contained in:
Matthew Woehlke
2026-04-23 13:30:41 -04:00
parent cba542f32c
commit be057c5a01
4 changed files with 32 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Source/cmVariableWatch.cxx
View File

@@ -7,16 +7,16 @@
#include <utility>
#include <vector>
std::string const& cmVariableWatch::GetAccessAsString(int access_type)
std::string const& cmVariableWatch::GetAccessAsString(AccessType accessType)
{
static std::array<std::string, 6> const cmVariableWatchAccessStrings = {
{ "READ_ACCESS", "UNKNOWN_READ_ACCESS", "UNKNOWN_DEFINED_ACCESS",
"MODIFIED_ACCESS", "REMOVED_ACCESS", "NO_ACCESS" }
};
if (access_type < 0 || access_type >= cmVariableWatch::NO_ACCESS) {
access_type = cmVariableWatch::NO_ACCESS;
if (accessType >= cmVariableWatch::NO_ACCESS) {
accessType = cmVariableWatch::NO_ACCESS;
}
return cmVariableWatchAccessStrings[access_type];
return cmVariableWatchAccessStrings[accessType];
}
cmVariableWatch::cmVariableWatch() = default;
@@ -63,7 +63,8 @@ void cmVariableWatch::RemoveWatch(std::string const& variable,
}
bool cmVariableWatch::VariableAccessed(std::string const& variable,
int access_type, char const* newValue,
AccessType accessType,
char const* newValue,
cmMakefile const* mf) const
{
auto mit = this->WatchMap.find(variable);
@@ -77,7 +78,7 @@ bool cmVariableWatch::VariableAccessed(std::string const& variable,
// lockable, and so this ensures we don't attempt to call into freed
// memory
if (auto it = weak_it.lock()) {
it->Method(variable, access_type, it->ClientData, newValue, mf);
it->Method(variable, accessType, it->ClientData, newValue, mf);
}
}
return true;

34
Source/cmVariableWatch.h
View File

@@ -19,8 +19,21 @@ class cmMakefile;
class cmVariableWatch
{
public:
using WatchMethod = void (*)(std::string const&, int, void*, char const*,
cmMakefile const*);
/**
* Different access types.
*/
enum AccessType : unsigned
{
VARIABLE_READ_ACCESS,
UNKNOWN_VARIABLE_READ_ACCESS,
UNKNOWN_VARIABLE_DEFINED_ACCESS,
VARIABLE_MODIFIED_ACCESS,
VARIABLE_REMOVED_ACCESS,
NO_ACCESS
};
using WatchMethod = void (*)(std::string const&, AccessType, void*,
char const*, cmMakefile const*);
using DeleteData = void (*)(void*);
cmVariableWatch();
@@ -37,26 +50,13 @@ public:
/**
* This method is called when variable is accessed
*/
bool VariableAccessed(std::string const& variable, int access_type,
bool VariableAccessed(std::string const& variable, AccessType accessType,
char const* newValue, cmMakefile const* mf) const;
/**
* Different access types.
*/
enum
{
VARIABLE_READ_ACCESS,
UNKNOWN_VARIABLE_READ_ACCESS,
UNKNOWN_VARIABLE_DEFINED_ACCESS,
VARIABLE_MODIFIED_ACCESS,
VARIABLE_REMOVED_ACCESS,
NO_ACCESS
};
/**
* Return the access as string
*/
static std::string const& GetAccessAsString(int access_type);
static std::string const& GetAccessAsString(AccessType accessType);
protected:
struct Pair

11
Source/cmVariableWatchCommand.cxx
View File

@@ -25,20 +25,19 @@ struct cmVariableWatchCallbackData
std::string Command;
};
void cmVariableWatchCommandVariableAccessed(std::string const& variable,
int access_type, void* client_data,
char const* newValue,
cmMakefile const* mf)
void cmVariableWatchCommandVariableAccessed(
std::string const& variable, cmVariableWatch::AccessType accessType,
void* clientData, char const* newValue, cmMakefile const* mf)
{
cmVariableWatchCallbackData* data =
static_cast<cmVariableWatchCallbackData*>(client_data);
static_cast<cmVariableWatchCallbackData*>(clientData);
if (data->InCallback) {
return;
}
data->InCallback = true;
auto accessString = cmVariableWatch::GetAccessAsString(access_type);
auto accessString = cmVariableWatch::GetAccessAsString(accessType);
/// Ultra bad!!
cmMakefile* makefile = const_cast<cmMakefile*>(mf);

5
Source/cmake.cxx
View File

@@ -166,8 +166,9 @@ using CommandArgument =
cmCommandLineArgument<bool(std::string const& value, cmake* state)>;
#ifndef CMAKE_BOOTSTRAP
void cmWarnUnusedCliWarning(std::string const& variable, int /*unused*/,
void* ctx, char const* /*unused*/,
void cmWarnUnusedCliWarning(std::string const& variable,
cmVariableWatch::AccessType /*unused*/, void* ctx,
char const* /*unused*/,
cmMakefile const* /*unused*/)
{
cmake* cm = reinterpret_cast<cmake*>(ctx);