Merge topic 'wrap-deps-rename'

e1129836 Rename ParseDependencyTracking to ParseDepends

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Reviewed-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !10670

Wrapping/Tools/CMakeLists.txt

@@ -9,7 +9,7 @@ endif ()
 set(sources
   vtkParse.tab.c
   vtkParseData.c
-  vtkParseDependencyTracking.c
+  vtkParseDepends.c
   vtkParseExtras.c
   vtkParseHierarchy.c
   vtkParseMain.c
@@ -25,7 +25,7 @@ set(headers
   vtkParse.h
   vtkParseAttributes.h
   vtkParseData.h
-  vtkParseDependencyTracking.h
+  vtkParseDepends.h
   vtkParseExtras.h
   vtkParseHierarchy.h
   vtkParseMain.h

Wrapping/Tools/vtkParseDependencyTracking.c → Wrapping/Tools/vtkParseDepends.c

@@ -2,7 +2,7 @@
 // SPDX-FileCopyrightText: Copyright (c) Kitware, Inc.
 // SPDX-License-Identifier: BSD-3-Clause
 
-#include "vtkParseDependencyTracking.h"
+#include "vtkParseDepends.h"
 #include "vtkParseData.h"
 #include "vtkParseString.h"
 #include "vtkParseSystem.h"
@@ -11,16 +11,16 @@
 #include <stdlib.h>
 #include <string.h>
 
-typedef struct DependencyTracking_
+typedef struct ParseDepends_
 {
   StringCache Strings;
   const char* Target;
   const char** Dependencies;
   int NumberOfDependencies;
-} DependencyTracking;
+} ParseDepends;
 
 // dependency tracking is done globally
-DependencyTracking DepTracker;
+ParseDepends DepTracker;
 
 void vtkParse_InitDependencyTracking(const char* target)
 {
@@ -35,7 +35,7 @@ void vtkParse_InitDependencyTracking(const char* target)
   DepTracker.NumberOfDependencies = 0;
 }
 
-void vtkParse_AddFileDependency(const char* dep)
+void vtkParse_AddDependency(const char* dep)
 {
   if (!DepTracker.Target)
   {
@@ -83,7 +83,7 @@ static int string_compare(const void* a, const void* b)
   return strcmp(*((const char**)a), *((const char**)b));
 }
 
-int vtkParse_DependencyTrackingWrite(const char* fname)
+int vtkParse_WriteDependencyFile(const char* fname)
 {
   FILE* fout = NULL;
   const char* prev_dep = NULL;

Wrapping/Tools/vtkParseDependencyTracking.h → Wrapping/Tools/vtkParseDepends.h

@@ -20,7 +20,7 @@ extern "C"
    * Add a dependency to the output.
    */
   VTKWRAPPINGTOOLS_EXPORT
-  void vtkParse_AddFileDependency(const char* dep);
+  void vtkParse_AddDependency(const char* dep);
 
   /**
    * Write dependency tracking information to a file.
@@ -28,7 +28,7 @@ extern "C"
    * Returns non-zero on error.
    */
   VTKWRAPPINGTOOLS_EXPORT
-  int vtkParse_DependencyTrackingWrite(const char* fname);
+  int vtkParse_WriteDependencyFile(const char* fname);
 
   /**
    * Finalize the dependency tracking structure.
@@ -39,4 +39,4 @@ extern "C"
 #ifdef __cplusplus
 } /* extern "C" */
 #endif
-/* VTK-HeaderTest-Exclude: vtkParseDependencyTracking.h */
+/* VTK-HeaderTest-Exclude: vtkParseDepends.h */

Wrapping/Tools/vtkParseMain.c

@@ -10,7 +10,7 @@ This file provides a unified front-end for the wrapper generators.
 #include "vtkParseMain.h"
 #include "vtkParse.h"
 #include "vtkParseData.h"
-#include "vtkParseDependencyTracking.h"
+#include "vtkParseDepends.h"
 #include "vtkParseSystem.h"
 #include <ctype.h>
 #include <stdio.h>
@@ -273,7 +273,7 @@ static int parse_check_options(int argc, char* argv[], int multi)
   options.NumberOfHintFileNames = 0;
   options.HintFileNames = NULL;
   options.DumpMacros = 0;
-  options.DepFileName = NULL;
+  options.DependencyFileName = NULL;
   options.WarningFlags.Empty = 0;
 
   for (i = 1; i < argc; i++)
@@ -322,7 +322,7 @@ static int parse_check_options(int argc, char* argv[], int multi)
       {
         return -1;
       }
-      options.DepFileName = argv[i];
+      options.DependencyFileName = argv[i];
     }
     else if (argv[i][0] == '-' && isalpha(argv[i][1]))
     {
@@ -427,7 +427,7 @@ int vtkParse_Finalize(void)
 {
   int ret = 0;
 
-  if (options.DepFileName && vtkParse_DependencyTrackingWrite(options.DepFileName))
+  if (options.DependencyFileName && vtkParse_WriteDependencyFile(options.DependencyFileName))
   {
     ret = 1;
   }
@@ -503,7 +503,7 @@ FileInfo* vtkParse_Main(int argc, char* argv[])
     exit(1);
   }
 
-  if (options.DepFileName && options.OutputFileName)
+  if (options.DependencyFileName && options.OutputFileName)
   {
     vtkParse_InitDependencyTracking(options.OutputFileName);
     /* TODO: register response files read in `read_option_file` here. */
@@ -603,7 +603,7 @@ StringCache* vtkParse_MainMulti(int argc, char* argv[])
     exit(1);
   }
 
-  if (options.DepFileName && options.OutputFileName)
+  if (options.DependencyFileName && options.OutputFileName)
   {
     vtkParse_InitDependencyTracking(options.OutputFileName);
     /* TODO: register response files read in `read_option_file` here. */

Wrapping/Tools/vtkParseMain.h

@@ -60,7 +60,7 @@ typedef struct OptionInfo_
   int NumberOfHierarchyFileNames; /* the total number of types argument */
   char** HierarchyFileNames;      /* the file preceded by "--types" */
   int DumpMacros;                 /* dump macros to output */
-  char* DepFileName;              /* dependency tracking output file */
+  char* DependencyFileName;       /* dependency tracking output file */
 
   Warnings WarningFlags; /* warning flags */
 } OptionInfo;

Wrapping/Tools/vtkParseSystem.c

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: BSD-3-Clause
 
 #include "vtkParseSystem.h"
-#include "vtkParseDependencyTracking.h"
+#include "vtkParseDepends.h"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -507,7 +507,7 @@ FILE* vtkParse_FileOpen(const char* fname, const char* mode)
   // Only add dependencies if reading the file.
   if (mode && *mode == 'r')
   {
-    vtkParse_AddFileDependency(fname);
+    vtkParse_AddDependency(fname);
   }
 
   return vtkParse_FileOpenNoDependency(fname, mode);

Wrapping/Tools/vtkParseSystem.h

@@ -8,7 +8,7 @@
 #ifndef vtkParseSystem_h
 #define vtkParseSystem_h
 
-#include "vtkParseDependencyTracking.h"
+#include "vtkParseDepends.h"
 #include "vtkParseString.h"
 #include "vtkWrappingToolsModule.h"