Merge topic 'cmState-rename-include-snapshot'

c54ed781 cmState: Rename CallStack snapshots to IncludeFile

Source/cmMakefile.cxx

@@ -333,7 +333,7 @@ cmMakefile::IncludeScope::IncludeScope(cmMakefile* mf,
   this->Makefile->PushFunctionBlockerBarrier();
 
   this->Makefile->StateSnapshot =
-      this->Makefile->GetState()->CreateCallStackSnapshot(
+      this->Makefile->GetState()->CreateIncludeFileSnapshot(
         this->Makefile->StateSnapshot,
         this->Makefile->ContextStack.back()->Name,
         this->Makefile->ContextStack.back()->Line,

Source/cmState.cxx

@@ -931,16 +931,16 @@ cmState::CreateMacroCallSnapshot(cmState::Snapshot originSnapshot,
 }
 
 cmState::Snapshot
-cmState::CreateCallStackSnapshot(cmState::Snapshot originSnapshot,
-                                 const std::string& entryPointCommand,
-                                 long entryPointLine,
-                                 const std::string& fileName)
+cmState::CreateIncludeFileSnapshot(cmState::Snapshot originSnapshot,
+                                   const std::string& entryPointCommand,
+                                   long entryPointLine,
+                                   const std::string& fileName)
 {
   PositionType pos = this->SnapshotData.Push(originSnapshot.Position,
                                              *originSnapshot.Position);
   pos->EntryPointLine = entryPointLine;
   pos->EntryPointCommand = entryPointCommand;
-  pos->SnapshotType = CallStackType;
+  pos->SnapshotType = IncludeFileType;
   pos->Keep = true;
   pos->ExecutionListFile = this->ExecutionListFiles.Push(
         originSnapshot.Position->ExecutionListFile, fileName);

Source/cmState.h

@@ -42,7 +42,7 @@ public:
     BuildsystemDirectoryType,
     FunctionCallType,
     MacroCallType,
-    CallStackType,
+    IncludeFileType,
     InlineListFileType,
     PolicyScopeType,
     VariableScopeType
@@ -203,10 +203,10 @@ public:
                                    std::string const& entryPointCommand,
                                    long entryPointLine,
                                    std::string const& fileName);
-  Snapshot CreateCallStackSnapshot(Snapshot originSnapshot,
-                                   std::string const& entryPointCommand,
-                                   long entryPointLine,
-                                   std::string const& fileName);
+  Snapshot CreateIncludeFileSnapshot(Snapshot originSnapshot,
+                                     std::string const& entryPointCommand,
+                                     long entryPointLine,
+                                     std::string const& fileName);
   Snapshot CreateVariableScopeSnapshot(Snapshot originSnapshot,
                                        std::string const& entryPointCommand,
                                        long entryPointLine);