Kitware/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2025-10-20 21:40:15 +08:00
Code Issues Projects Releases Wiki Activity

cmState: Clarify name of member tracking the active scope in a directory

Browse Source 
The `DirectoryEnd` member added by commit 52dbe654de (cmState: Record
the end position of each directory., 2015-08-01, v3.4.0-rc1~251^2~1)
actually tracks the current top-most scope in a directory's stack.  This
is evidenced by the use case in commit 3f4e5e8c3d (cmState: Return end
snapshot for GetBuildsystemDirectoryParent., 2015-09-01,
v3.4.0-rc1~100^2~1).  Rename the member to `CurrentScope` to clarify
this role.
This commit is contained in:
Brad King
2022-11-07 14:33:06 -05:00
parent cb53d9309e
commit 96ddcbee60
3 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
Source/cmState.cxx
View File

@@ -281,7 +281,7 @@ cmStateSnapshot cmState::Reset()
it->CompileOptions.clear(); it->CompileOptions.clear();
it->LinkOptions.clear(); it->LinkOptions.clear();
it->LinkDirectories.clear(); it->LinkDirectories.clear();
it->DirectoryEnd = pos; it->CurrentScope = pos;
it->NormalTargetNames.clear(); it->NormalTargetNames.clear();
it->ImportedTargetNames.clear(); it->ImportedTargetNames.clear();
it->Properties.Clear(); it->Properties.Clear();
@@ -819,7 +819,7 @@ cmStateSnapshot cmState::CreateBaseSnapshot()
pos->CompileOptionsPosition = 0; pos->CompileOptionsPosition = 0;
pos->LinkOptionsPosition = 0; pos->LinkOptionsPosition = 0;
pos->LinkDirectoriesPosition = 0; pos->LinkDirectoriesPosition = 0;
pos->BuildSystemDirectory->DirectoryEnd = pos; pos->BuildSystemDirectory->CurrentScope = pos;
pos->Policies = this->PolicyStack.Root(); pos->Policies = this->PolicyStack.Root();
pos->PolicyRoot = this->PolicyStack.Root(); pos->PolicyRoot = this->PolicyStack.Root();
pos->PolicyScope = this->PolicyStack.Root(); pos->PolicyScope = this->PolicyStack.Root();
@@ -846,7 +846,7 @@ cmStateSnapshot cmState::CreateBuildsystemDirectorySnapshot(
originSnapshot.Position->BuildSystemDirectory); originSnapshot.Position->BuildSystemDirectory);
pos->ExecutionListFile = pos->ExecutionListFile =
this->ExecutionListFiles.Push(originSnapshot.Position->ExecutionListFile); this->ExecutionListFiles.Push(originSnapshot.Position->ExecutionListFile);
pos->BuildSystemDirectory->DirectoryEnd = pos; pos->BuildSystemDirectory->CurrentScope = pos;
pos->Policies = originSnapshot.Position->Policies; pos->Policies = originSnapshot.Position->Policies;
pos->PolicyRoot = originSnapshot.Position->Policies; pos->PolicyRoot = originSnapshot.Position->Policies;
pos->PolicyScope = originSnapshot.Position->Policies; pos->PolicyScope = originSnapshot.Position->Policies;
@@ -876,7 +876,7 @@ cmStateSnapshot cmState::CreateDeferCallSnapshot(
pos->ExecutionListFile = this->ExecutionListFiles.Push( pos->ExecutionListFile = this->ExecutionListFiles.Push(
originSnapshot.Position->ExecutionListFile, fileName); originSnapshot.Position->ExecutionListFile, fileName);
assert(originSnapshot.Position->Vars.IsValid()); assert(originSnapshot.Position->Vars.IsValid());
pos->BuildSystemDirectory->DirectoryEnd = pos; pos->BuildSystemDirectory->CurrentScope = pos;
pos->PolicyScope = originSnapshot.Position->Policies; pos->PolicyScope = originSnapshot.Position->Policies;
return { this, pos }; return { this, pos };
} }
@@ -891,7 +891,7 @@ cmStateSnapshot cmState::CreateFunctionCallSnapshot(
pos->Keep = false; pos->Keep = false;
pos->ExecutionListFile = this->ExecutionListFiles.Push( pos->ExecutionListFile = this->ExecutionListFiles.Push(
originSnapshot.Position->ExecutionListFile, fileName); originSnapshot.Position->ExecutionListFile, fileName);
pos->BuildSystemDirectory->DirectoryEnd = pos; pos->BuildSystemDirectory->CurrentScope = pos;
pos->PolicyScope = originSnapshot.Position->Policies; pos->PolicyScope = originSnapshot.Position->Policies;
assert(originSnapshot.Position->Vars.IsValid()); assert(originSnapshot.Position->Vars.IsValid());
cmLinkedTree<cmDefinitions>::iterator origin = originSnapshot.Position->Vars; cmLinkedTree<cmDefinitions>::iterator origin = originSnapshot.Position->Vars;
@@ -910,7 +910,7 @@ cmStateSnapshot cmState::CreateMacroCallSnapshot(
pos->ExecutionListFile = this->ExecutionListFiles.Push( pos->ExecutionListFile = this->ExecutionListFiles.Push(
originSnapshot.Position->ExecutionListFile, fileName); originSnapshot.Position->ExecutionListFile, fileName);
assert(originSnapshot.Position->Vars.IsValid()); assert(originSnapshot.Position->Vars.IsValid());
pos->BuildSystemDirectory->DirectoryEnd = pos; pos->BuildSystemDirectory->CurrentScope = pos;
pos->PolicyScope = originSnapshot.Position->Policies; pos->PolicyScope = originSnapshot.Position->Policies;
return { this, pos }; return { this, pos };
} }
@@ -925,7 +925,7 @@ cmStateSnapshot cmState::CreateIncludeFileSnapshot(
pos->ExecutionListFile = this->ExecutionListFiles.Push( pos->ExecutionListFile = this->ExecutionListFiles.Push(
originSnapshot.Position->ExecutionListFile, fileName); originSnapshot.Position->ExecutionListFile, fileName);
assert(originSnapshot.Position->Vars.IsValid()); assert(originSnapshot.Position->Vars.IsValid());
pos->BuildSystemDirectory->DirectoryEnd = pos; pos->BuildSystemDirectory->CurrentScope = pos;
pos->PolicyScope = originSnapshot.Position->Policies; pos->PolicyScope = originSnapshot.Position->Policies;
return { this, pos }; return { this, pos };
} }
@@ -938,7 +938,7 @@ cmStateSnapshot cmState::CreateVariableScopeSnapshot(
pos->ScopeParent = originSnapshot.Position; pos->ScopeParent = originSnapshot.Position;
pos->SnapshotType = cmStateEnums::VariableScopeType; pos->SnapshotType = cmStateEnums::VariableScopeType;
pos->Keep = false; pos->Keep = false;
pos->BuildSystemDirectory->DirectoryEnd = pos; pos->BuildSystemDirectory->CurrentScope = pos;
pos->PolicyScope = originSnapshot.Position->Policies; pos->PolicyScope = originSnapshot.Position->Policies;
assert(originSnapshot.Position->Vars.IsValid()); assert(originSnapshot.Position->Vars.IsValid());
@@ -958,7 +958,7 @@ cmStateSnapshot cmState::CreateInlineListFileSnapshot(
pos->Keep = true; pos->Keep = true;
pos->ExecutionListFile = this->ExecutionListFiles.Push( pos->ExecutionListFile = this->ExecutionListFiles.Push(
originSnapshot.Position->ExecutionListFile, fileName); originSnapshot.Position->ExecutionListFile, fileName);
pos->BuildSystemDirectory->DirectoryEnd = pos; pos->BuildSystemDirectory->CurrentScope = pos;
pos->PolicyScope = originSnapshot.Position->Policies; pos->PolicyScope = originSnapshot.Position->Policies;
return { this, pos }; return { this, pos };
} }
@@ -970,7 +970,7 @@ cmStateSnapshot cmState::CreatePolicyScopeSnapshot(
this->SnapshotData.Push(originSnapshot.Position, *originSnapshot.Position); this->SnapshotData.Push(originSnapshot.Position, *originSnapshot.Position);
pos->SnapshotType = cmStateEnums::PolicyScopeType; pos->SnapshotType = cmStateEnums::PolicyScopeType;
pos->Keep = false; pos->Keep = false;
pos->BuildSystemDirectory->DirectoryEnd = pos; pos->BuildSystemDirectory->CurrentScope = pos;
pos->PolicyScope = originSnapshot.Position->Policies; pos->PolicyScope = originSnapshot.Position->Policies;
return { this, pos }; return { this, pos };
} }
@@ -990,7 +990,7 @@ cmStateSnapshot cmState::Pop(cmStateSnapshot const& originSnapshot)
prevPos->BuildSystemDirectory->LinkOptions.size(); prevPos->BuildSystemDirectory->LinkOptions.size();
prevPos->LinkDirectoriesPosition = prevPos->LinkDirectoriesPosition =
prevPos->BuildSystemDirectory->LinkDirectories.size(); prevPos->BuildSystemDirectory->LinkDirectories.size();
prevPos->BuildSystemDirectory->DirectoryEnd = prevPos; prevPos->BuildSystemDirectory->CurrentScope = prevPos;
if (!pos->Keep && this->SnapshotData.IsLast(pos)) { if (!pos->Keep && this->SnapshotData.IsLast(pos)) {
if (pos->Vars != prevPos->Vars) { if (pos->Vars != prevPos->Vars) {

2
Source/cmStatePrivate.h
View File

@@ -62,7 +62,7 @@ struct cmStateDetail::PolicyStackEntry : public cmPolicies::PolicyMap
struct cmStateDetail::BuildsystemDirectoryStateType struct cmStateDetail::BuildsystemDirectoryStateType
{ {
cmStateDetail::PositionType DirectoryEnd; cmStateDetail::PositionType CurrentScope;
std::string Location; std::string Location;
std::string OutputLocation; std::string OutputLocation;

10
Source/cmStateSnapshot.cxx
View File

@@ -64,7 +64,7 @@ bool cmStateSnapshot::IsValid() const
cmStateSnapshot cmStateSnapshot::GetBuildsystemDirectory() const cmStateSnapshot cmStateSnapshot::GetBuildsystemDirectory() const
{ {
return { this->State, this->Position->BuildSystemDirectory->DirectoryEnd }; return { this->State, this->Position->BuildSystemDirectory->CurrentScope };
} }
cmStateSnapshot cmStateSnapshot::GetBuildsystemDirectoryParent() const cmStateSnapshot cmStateSnapshot::GetBuildsystemDirectoryParent() const
@@ -76,7 +76,7 @@ cmStateSnapshot cmStateSnapshot::GetBuildsystemDirectoryParent() const
cmStateDetail::PositionType parentPos = this->Position->DirectoryParent; cmStateDetail::PositionType parentPos = this->Position->DirectoryParent;
if (parentPos != this->State->SnapshotData.Root()) { if (parentPos != this->State->SnapshotData.Root()) {
snapshot = cmStateSnapshot(this->State, snapshot = cmStateSnapshot(this->State,
parentPos->BuildSystemDirectory->DirectoryEnd); parentPos->BuildSystemDirectory->CurrentScope);
} }
return snapshot; return snapshot;
@@ -177,9 +177,9 @@ cmPolicies::PolicyStatus cmStateSnapshot::GetPolicy(cmPolicies::PolicyID id,
while (true) { while (true) {
assert(dir.IsValid()); assert(dir.IsValid());
cmLinkedTree<cmStateDetail::PolicyStackEntry>::iterator leaf = cmLinkedTree<cmStateDetail::PolicyStackEntry>::iterator leaf =
dir->DirectoryEnd->Policies; dir->CurrentScope->Policies;
cmLinkedTree<cmStateDetail::PolicyStackEntry>::iterator root = cmLinkedTree<cmStateDetail::PolicyStackEntry>::iterator root =
dir->DirectoryEnd->PolicyRoot; dir->CurrentScope->PolicyRoot;
for (; leaf != root; ++leaf) { for (; leaf != root; ++leaf) {
if (parent_scope) { if (parent_scope) {
parent_scope = false; parent_scope = false;
@@ -190,7 +190,7 @@ cmPolicies::PolicyStatus cmStateSnapshot::GetPolicy(cmPolicies::PolicyID id,
return status; return status;
} }
} }
cmStateDetail::PositionType e = dir->DirectoryEnd; cmStateDetail::PositionType e = dir->CurrentScope;
cmStateDetail::PositionType p = e->DirectoryParent; cmStateDetail::PositionType p = e->DirectoryParent;
if (p == this->State->SnapshotData.Root()) { if (p == this->State->SnapshotData.Root()) {
break; break;