diff --git a/Wrapping/Tools/CMakeLists.txt b/Wrapping/Tools/CMakeLists.txt index 05aa805f0389934702b6787b85da4fea26d37d39..e0b6f025ba20e73695b2b2bbec5d98868ef086af 100644 --- a/Wrapping/Tools/CMakeLists.txt +++ b/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 diff --git a/Wrapping/Tools/vtkParseDependencyTracking.c b/Wrapping/Tools/vtkParseDepends.c similarity index 92% rename from Wrapping/Tools/vtkParseDependencyTracking.c rename to Wrapping/Tools/vtkParseDepends.c index 94b9ffc1762d7459a23ee9da4456f99aca37e7a2..b8050dbb681cd86eb2d0eee06c82138a4e477eee 100644 --- a/Wrapping/Tools/vtkParseDependencyTracking.c +++ b/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; diff --git a/Wrapping/Tools/vtkParseDependencyTracking.h b/Wrapping/Tools/vtkParseDepends.h similarity index 83% rename from Wrapping/Tools/vtkParseDependencyTracking.h rename to Wrapping/Tools/vtkParseDepends.h index bd764f87f1d1cb93bd96421977132bda68bb0797..ca07675e2722f9b4fa939862905f7186a796e893 100644 --- a/Wrapping/Tools/vtkParseDependencyTracking.h +++ b/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 */ diff --git a/Wrapping/Tools/vtkParseMain.c b/Wrapping/Tools/vtkParseMain.c index 8720ab5778e8fc38df2ab6eff88804afdcb8a3de..0bc3f8b3e647a82c916deba3f4c91ee56d34d2b8 100644 --- a/Wrapping/Tools/vtkParseMain.c +++ b/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. */ diff --git a/Wrapping/Tools/vtkParseMain.h b/Wrapping/Tools/vtkParseMain.h index ac70d6edfba38ab7492c16434d2c4960390b64f1..b3f6fe8ef3ea84bb967a200e9eefefd0c324a3c4 100644 --- a/Wrapping/Tools/vtkParseMain.h +++ b/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; diff --git a/Wrapping/Tools/vtkParseSystem.c b/Wrapping/Tools/vtkParseSystem.c index dd891953ff470727a90d5b83b0eaa385b217986c..203320e22573d89fac5c89227ceaf24d98c9e8ed 100644 --- a/Wrapping/Tools/vtkParseSystem.c +++ b/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); diff --git a/Wrapping/Tools/vtkParseSystem.h b/Wrapping/Tools/vtkParseSystem.h index c158819eb0fd2a47b0b5413ae7f2113ff7bf4893..a1410f1b8b04db05ddd9ef263b4f447ae948f23b 100644 --- a/Wrapping/Tools/vtkParseSystem.h +++ b/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"