Manual search & destroy of (B|E)TX

First automatically removed lines with only BTX/ETX from .h files with the following regexes: ^ *// *BTX\r ^ *// *ETX\r and replaced occurances with nothing. Committed that, then manually removed various remaining cases of BTX/ETX, and related comments, and parsing stuff, then trashed the first commit.
Kitware · May 20, 2016 · 55878a2 · 55878a2
1 parent 61b3201
commit 55878a2
Show file tree

Hide file tree

Showing 23 changed files with 3 additions and 136 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -455,9 +455,6 @@ set(VTK_PYTHON_VERSION 2 CACHE STRING
 # Add the option for build the Python wrapping to VTK.
 option(VTK_WRAP_JAVA "Should VTK Java wrapping be built?" OFF)
 
-# FIXME: This variable should not be necessary once we are done
-set(VTK_IGNORE_BTX ON CACHE INTERNAL "VTK modular always ignores BTX")
-
 # Force reset of hints file location in cache if it was moved
 if(VTK_WRAP_HINTS)
   if(NOT EXISTS ${VTK_WRAP_HINTS})

diff --git a/Common/Core/Testing/Python/CMakeLists.txt b/Common/Core/Testing/Python/CMakeLists.txt
@@ -9,7 +9,6 @@ vtk_add_test_python(
   TestEnums.py
   TestExecuteMethodFinalizeCrash.py
   TestGhost.py
-  TestIgnoreBTX.py
   TestMutable.py
   TestNumpySupport.py
   TestNumpyInterface.py

diff --git a/Common/Core/Testing/Python/TestIgnoreBTX.py b/Common/Core/Testing/Python/TestIgnoreBTX.py
diff --git a/Common/Core/Testing/Tcl/CMakeLists.txt b/Common/Core/Testing/Tcl/CMakeLists.txt
@@ -4,7 +4,6 @@ vtk_add_test_tcl(
 #  TestEmptyInput.tcl
 #  TestSetGet.tcl
   TestString.tcl
-  TestIgnoreBTX.tcl
   otherInterp.tcl
   otherPrint.tcl
   )
diff --git a/Common/Core/Testing/Tcl/TestIgnoreBTX.tcl b/Common/Core/Testing/Tcl/TestIgnoreBTX.tcl
diff --git a/Common/Core/vtkCollection.h b/Common/Core/vtkCollection.h
@@ -31,7 +31,6 @@
 #include "vtkCommonCoreModule.h" // For export macro
 #include "vtkObject.h"
 
-//BTX - begin tcl exclude
 class vtkCollectionElement //;prevents pick-up by man page generator
 {
  public:
@@ -40,7 +39,6 @@ class vtkCollectionElement //;prevents pick-up by man page generator
   vtkCollectionElement *Next;
 };
 typedef void * vtkCollectionSimpleIterator;
-//ETX end tcl exclude
 
 class vtkCollectionIterator;
 

diff --git a/Common/DataModel/vtkAbstractCellLocator.h b/Common/DataModel/vtkAbstractCellLocator.h
@@ -22,11 +22,9 @@
 // When deriving a class from vtkAbstractCellLocator, one should include the
 // 'hidden' member functions by the following construct in the derived class
 // \verbatim
-// //BTX
 //  using vtkAbstractCellLocator::IntersectWithLine;
 //  using vtkAbstractCellLocator::FindClosestPoint;
 //  using vtkAbstractCellLocator::FindClosestPointWithinRadius;
-// //ETX
 // \endverbatim
 
 //
@@ -259,9 +257,7 @@ class VTKCOMMONDATAMODEL_EXPORT vtkAbstractCellLocator : public vtkLocator
   int LazyEvaluation;
   int UseExistingSearchStructure;
   vtkGenericCell *GenericCell;
-//BTX - begin tcl exclude
   double (*CellBounds)[6];
-//ETX - end tcl exclude
 
 private:
   vtkAbstractCellLocator(const vtkAbstractCellLocator&);  // Not implemented.

diff --git a/Filters/Core/vtkDecimatePro.h b/Filters/Core/vtkDecimatePro.h
@@ -279,8 +279,6 @@ class VTKFILTERSCORE_EXPORT vtkDecimatePro : public vtkPolyDataAlgorithm
   //
   // Special classes for manipulating data
   //
-  //BTX - begin tcl exclude
-  //
   // Special structures for building loops
   class LocalVertex
   {
@@ -340,8 +338,6 @@ class VTKFILTERSCORE_EXPORT vtkDecimatePro : public vtkPolyDataAlgorithm
     LocalTri *Array;  // pointer to data
     vtkIdType MaxId;           // maximum index inserted thus far
   };
-  //ETX - end tcl exclude
-  //
 
 private:
   void InitializeQueue(vtkIdType numPts);

diff --git a/Filters/FlowPaths/vtkStreamer.h b/Filters/FlowPaths/vtkStreamer.h
@@ -212,8 +212,6 @@ class VTKFILTERSFLOWPATHS_EXPORT vtkStreamer : public vtkPolyDataAlgorithm
   //
   // Special classes for manipulating data
   //
-  //BTX - begin tcl exclude
-  //
   class StreamPoint {
   public:
     double    x[3];    // position

diff --git a/Filters/General/vtkHyperStreamline.cxx b/Filters/General/vtkHyperStreamline.cxx
@@ -28,7 +28,7 @@ vtkStandardNewMacro(vtkHyperStreamline);
 
 //
 // Special classes for manipulating data
-//BTX
+//
 class vtkHyperPoint { //;prevent man page generation
 public:
     vtkHyperPoint(); // method sets up storage
@@ -46,7 +46,6 @@ class vtkHyperPoint { //;prevent man page generation
     double   S;       // scalar value
     double   D;       // distance travelled so far
 };
-//ETX
 
 class vtkHyperArray { //;prevent man page generation
 public:

diff --git a/Filters/General/vtkUncertaintyTubeFilter.cxx b/Filters/General/vtkUncertaintyTubeFilter.cxx
@@ -31,7 +31,7 @@ vtkStandardNewMacro(vtkUncertaintyTubeFilter);
 
 //
 // Special classes for manipulating data
-//BTX
+//
 class vtkTubePoint { //;prevent man page generation
 public:
   vtkTubePoint(); // method sets up storage
@@ -44,7 +44,6 @@ class vtkTubePoint { //;prevent man page generation
   double   V2[3];   // another, orthogonal normal to the line
   double   Vector[3];//local uncertainty vector
 };
-//ETX
 
 class vtkTubeArray { //;prevent man page generation
 public:

diff --git a/Filters/Hybrid/Testing/Cxx/TestTemporalCacheSimple.cxx b/Filters/Hybrid/Testing/Cxx/TestTemporalCacheSimple.cxx
@@ -60,9 +60,7 @@ class vtkTemporalSphereSource : public vtkSphereSource {
   // Save the range of valid timestep index values.
   vtkGetVector2Macro(TimeStepRange, int);
 
-  //BTX
 //  void GetTimeStepValues(std::vector<double> &steps);
-  //ETX
 
  protected:
    vtkTemporalSphereSource();

diff --git a/Geovis/Core/vtkCompassWidget.h b/Geovis/Core/vtkCompassWidget.h
@@ -109,7 +109,6 @@ class VTKGEOVISCORE_EXPORT vtkCompassWidget : public vtkAbstractWidget
   static void MoveAction(vtkAbstractWidget*);
   static void TimerAction(vtkAbstractWidget*);
 
-//BTX - manage the state of the widget
   int WidgetState;
   enum _WidgetState
   {

diff --git a/Imaging/Morphological/vtkImageConnector.h b/Imaging/Morphological/vtkImageConnector.h
@@ -35,8 +35,6 @@ class vtkImageData;
 //
 // Special classes for manipulating data
 //
-//BTX - begin tcl exclude
-//
 // For the breadth first search
 class vtkImageConnectorSeed { //;prevent man page generation
 public:
@@ -45,8 +43,6 @@ class vtkImageConnectorSeed { //;prevent man page generation
   int  Index[3];
   vtkImageConnectorSeed *Next;
 };
-//ETX - end tcl exclude
-//
 
 
 class VTKIMAGINGMORPHOLOGICAL_EXPORT vtkImageConnector : public vtkObject

diff --git a/Utilities/Doxygen/doc_index.stop b/Utilities/Doxygen/doc_index.stop
@@ -727,5 +727,3 @@ ymax
 ymin
 zmax
 zmin
-ETX
-BTX
diff --git a/Utilities/Upgrading/README.WindowsMangling.txt b/Utilities/Upgrading/README.WindowsMangling.txt
@@ -89,10 +89,8 @@ of whether windows.h has been included before it:
 #ifdef VTK_WORKAROUND_WINDOWS_MANGLE
 # undef GetClassNameW
 # undef GetClassNameA
-  //BTX
   const char* GetClassNameA() const;
   const char* GetClassNameW() const;
-  //ETX
 #endif
 
 The method GetClassName has three cases.  If windows.h is not included
@@ -103,9 +101,7 @@ preprocessor will not recursively expand a macro, so replacement stops
 there and the GetClassName method is declared.  When UNICODE is
 defined the same process occurs but through GetClassNameW instead.
 The methods GetClassNameA and GetClassNameW are not mangled so they
-can be provided directly.  They are surrounded by a BTX/ETX pair
-because they should not be wrapped since scripting language code will
-not be mangled by windows.h.
+can be provided directly.
 
 Now that all three names are provided we can address the fact that
 GetClassName is supposed to be a virtual function.  When a subclass

diff --git a/Wrapping/Tools/lex.yy.c b/Wrapping/Tools/lex.yy.c
@@ -2305,16 +2305,10 @@ YY_RULE_SETUP
 case 4:
 YY_RULE_SETUP
 
-{
-      if (!IgnoreBTX) {
-        skip_ahead_until("//ETX");
-      }
-    }
         YY_BREAK
 case 5:
 YY_RULE_SETUP
 
-/* eat mismatched ETX */
         YY_BREAK
 case 6:
 YY_RULE_SETUP

diff --git a/Wrapping/Tools/vtkParse.h b/Wrapping/Tools/vtkParse.h
@@ -49,11 +49,6 @@ void vtkParse_IncludeDirectory(const char *dirname);
  */
 const char *vtkParse_FindIncludeFile(const char *filename);
 
-/**
- * Ignore BTX/ETX markers
- */
-void vtkParse_SetIgnoreBTX(int option);
-
 /**
  * Set the command name, for error reporting and diagnostics.
  */

diff --git a/Wrapping/Tools/vtkParse.l b/Wrapping/Tools/vtkParse.l
@@ -99,14 +99,6 @@ ID [a-zA-Z_\x80-\xff][0-9a-zA-Z_\x80-\xff]*
 
 "/*" { skip_comment(); }
 
-^[\t ]*"//BTX".* {
-      if (!IgnoreBTX) {
-        skip_ahead_until("//ETX");
-      }
-    }
-
-^[\t ]*"//ETX".*  /* eat mismatched ETX */
-
 ^[\t ]*("@interface"|"@implementation") {
       skip_ahead_until("@end");
     }

diff --git a/Wrapping/Tools/vtkParse.tab.c b/Wrapping/Tools/vtkParse.tab.c
@@ -241,7 +241,6 @@ int            NumberOfDefinitions = 0;
 const char   **Definitions;
 
 /* options that can be set by the programs that use the parser */
-int            IgnoreBTX = 0;
 int            Recursive = 0;
 const char    *CommandName = NULL;
 
@@ -12397,19 +12396,6 @@ void outputGetVectorMacro(const char *var, unsigned int paramType,
   output_function();
 }
 
-/* Set a flag to ignore BTX/ETX markers in the files */
-void vtkParse_SetIgnoreBTX(int option)
-{
-  if (option)
-    {
-    IgnoreBTX = 1;
-    }
-  else
-    {
-    IgnoreBTX = 0;
-    }
-}
-
 /* Set a flag to recurse into included files */
 void vtkParse_SetRecursive(int option)
 {

diff --git a/Wrapping/Tools/vtkParse.y b/Wrapping/Tools/vtkParse.y
@@ -202,7 +202,6 @@ int            NumberOfDefinitions = 0;
 const char   **Definitions;
 
 /* options that can be set by the programs that use the parser */
-int            IgnoreBTX = 0;
 int            Recursive = 0;
 const char    *CommandName = NULL;
 
@@ -4974,19 +4973,6 @@ void outputGetVectorMacro(const char *var, unsigned int paramType,
   output_function();
 }
 
-/* Set a flag to ignore BTX/ETX markers in the files */
-void vtkParse_SetIgnoreBTX(int option)
-{
-  if (option)
-    {
-    IgnoreBTX = 1;
-    }
-  else
-    {
-    IgnoreBTX = 0;
-    }
-}
-
 /* Set a flag to recurse into included files */
 void vtkParse_SetRecursive(int option)
 {

diff --git a/Wrapping/Tools/vtkParseMain.c b/Wrapping/Tools/vtkParseMain.c
@@ -456,13 +456,6 @@ FileInfo *vtkParse_Main(int argc, char *argv[])
     exit(1);
     }
 
-  /* if a hierarchy is was given, then BTX/ETX can be ignored */
-  vtkParse_SetIgnoreBTX(0);
-  if (options.HierarchyFileNames)
-    {
-    vtkParse_SetIgnoreBTX(1);
-    }
-
   /* parse the input file */
   data = vtkParse_ParseFile(options.InputFileName, ifile, stderr);
 

diff --git a/Wrapping/Tools/vtkWrapHierarchy.c b/Wrapping/Tools/vtkWrapHierarchy.c
@@ -576,9 +576,6 @@ static char **vtkWrapHierarchy_ParseHeaderFile(
     lines[0] = NULL;
     }
 
-  /* always ignore BTX markers when building hierarchy files */
-  vtkParse_SetIgnoreBTX(1);
-
   /* the "concrete" flag doesn't matter, just set to zero */
   data = vtkParse_ParseFile(filename, fp, stderr);