ENH: make end of file checking for close if, foreach, macro, functions etc enabled. Not sure why it was disabled to start with, but I suspect I will find out. In reponse to Bill email about a ctest -S script with a function that waqs not closed. Closure was only checked for regular listfiles not other files.

1 files changed, 9 insertions, 8 deletions

diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 4c871ef..bdf3e64 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -487,13 +487,14 @@ bool cmMakefile::ReadListFile(const char* filename_in,
       {
       this->cmCurrentListFile = filename;
       }
-    // loop over current function blockers and record them
-    std::list<cmFunctionBlocker *>::iterator pos;
-    for (pos = this->FunctionBlockers.begin();
-         pos != this->FunctionBlockers.end(); ++pos)
-      {
-      originalBlockers.insert(*pos);
-      }
+    }
+
+  // loop over current function blockers and record them
+  std::list<cmFunctionBlocker *>::iterator pos;
+  for (pos = this->FunctionBlockers.begin();
+       pos != this->FunctionBlockers.end(); ++pos)
+    {
+    originalBlockers.insert(*pos);
     }
 
   // Now read the input file
@@ -542,7 +543,7 @@ bool cmMakefile::ReadListFile(const char* filename_in,
     }
   // add this list file to the list of dependencies
   this->ListFiles.push_back( filenametoread);
-  bool endScopeNicely = filename? true: false;
+  bool endScopeNicely = true;
   const size_t numberFunctions = cacheFile.Functions.size();
   for(size_t i =0; i < numberFunctions; ++i)
     {