No longer use reserved identifiers for include guards

Automatically detected using clang-tidy with bugprone-reserved-identifier
check.

By the way, homogeneize the define identifiers in relation to camel case
convention.

src/Bytecode.hh

@@ -17,8 +17,8 @@
  * along with Dynare.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-#ifndef _BYTECODE_HH
+#ifndef BYTECODE_HH
-#define _BYTECODE_HH
+#define BYTECODE_HH
 
 #include <filesystem>
 #include <fstream>
@@ -1151,4 +1151,4 @@ BytecodeWriter& operator<<(BytecodeWriter& code_file, const FCALL_& instr);
 template<>
 BytecodeWriter& operator<<(BytecodeWriter& code_file, const FBEGINBLOCK_& instr);
 
-#endif // _BYTECODE_HH
+#endif

src/CommonEnums.hh

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2007-2022 Dynare Team
+ * Copyright © 2007-2023 Dynare Team
  *
  * This file is part of Dynare.
  *
@@ -17,8 +17,8 @@
  * along with Dynare.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-#ifndef _COMMON_ENUMS_HH
+#ifndef COMMON_ENUMS_HH
-#define _COMMON_ENUMS_HH
+#define COMMON_ENUMS_HH
 
 //! Enumeration of possible symbol types
 /*! Warning: do not to change existing values for 0 to 4: the values matter for homotopy_setup
@@ -151,4 +151,4 @@ enum class PacTargetKind
   dd
 };
 
-#endif // _COMMON_ENUMS_HH
+#endif

src/ComputingTasks.hh

@@ -17,8 +17,8 @@
  * along with Dynare.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-#ifndef _COMPUTINGTASKS_HH
+#ifndef COMPUTING_TASKS_HH
-#define _COMPUTINGTASKS_HH
+#define COMPUTING_TASKS_HH
 
 #include <memory>
 #include <optional>

src/ConfigFile.hh

@@ -17,8 +17,8 @@
  * along with Dynare.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-#ifndef _CONFIG_FILE_HH
+#ifndef CONFIG_FILE_HH
-#define _CONFIG_FILE_HH
+#define CONFIG_FILE_HH
 
 #include <filesystem>
 #include <map>
@@ -145,4 +145,4 @@ public:
   void writeEndParallel(ostream& output) const;
 };
 
-#endif // ! CONFIG_FILE_HH
+#endif

src/DataTree.hh

@@ -17,8 +17,8 @@
  * along with Dynare.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-#ifndef _DATATREE_HH
+#ifndef DATA_TREE_HH
-#define _DATATREE_HH
+#define DATA_TREE_HH
 
 #include <cmath>
 #include <filesystem>

src/DynamicModel.hh

@@ -17,8 +17,8 @@
  * along with Dynare.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-#ifndef _DYNAMICMODEL_HH
+#ifndef DYNAMIC_MODEL_HH
-#define _DYNAMICMODEL_HH
+#define DYNAMIC_MODEL_HH
 
 #include <filesystem>
 #include <fstream>

src/EquationTags.hh

@@ -17,8 +17,8 @@
  * along with Dynare.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-#ifndef _EQUATION_TAGS_HH
+#ifndef EQUATION_TAGS_HH
-#define _EQUATION_TAGS_HH
+#define EQUATION_TAGS_HH
 
 #include <map>
 #include <optional>

src/ExprNode.hh

@@ -17,8 +17,8 @@
  * along with Dynare.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-#ifndef _EXPR_NODE_HH
+#ifndef EXPR_NODE_HH
-#define _EXPR_NODE_HH
+#define EXPR_NODE_HH
 
 #include <functional>
 #include <map>

src/ExtendedPreprocessorTypes.hh

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2014-2021 Dynare Team
+ * Copyright © 2014-2023 Dynare Team
  *
  * This file is part of Dynare.
  *
@@ -17,8 +17,8 @@
  * along with Dynare.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-#ifndef _EXTENDED_PREPROCESSOR_TYPES_HH
+#ifndef EXTENDED_PREPROCESSOR_TYPES_HH
-#define _EXTENDED_PREPROCESSOR_TYPES_HH
+#define EXTENDED_PREPROCESSOR_TYPES_HH
 
 // Values for the “output” option
 enum class OutputType

src/ExternalFunctionsTable.hh

@@ -17,8 +17,8 @@
  * along with Dynare.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-#ifndef _EXTERNALFUNCTIONSTABLE_HH
+#ifndef EXTERNAL_FUNCTIONS_TABLE_HH
-#define _EXTERNALFUNCTIONSTABLE_HH
+#define EXTERNAL_FUNCTIONS_TABLE_HH
 
 #include <algorithm>
 #include <iostream>

src/ModFile.hh

@@ -17,8 +17,8 @@
  * along with Dynare.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-#ifndef _MOD_FILE_HH
+#ifndef MOD_FILE_HH
-#define _MOD_FILE_HH
+#define MOD_FILE_HH
 
 #include <ctime>
 #include <filesystem>
@@ -194,4 +194,4 @@ public:
                        bool jsonderivsimple = false);
 };
 
-#endif // ! MOD_FILE_HH
+#endif

src/ModelEquationBlock.hh

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2010-2022 Dynare Team
+ * Copyright © 2010-2023 Dynare Team
  *
  * This file is part of Dynare.
  *
@@ -17,8 +17,8 @@
  * along with Dynare.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-#ifndef _MODEL_EQUATION_BLOCK_HH
+#ifndef MODEL_EQUATION_BLOCK_HH
-#define _MODEL_EQUATION_BLOCK_HH
+#define MODEL_EQUATION_BLOCK_HH
 
 #include "DataTree.hh"
 #include "DynamicModel.hh"

src/ModelTree.hh

@@ -17,8 +17,8 @@
  * along with Dynare.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-#ifndef _MODELTREE_HH
+#ifndef MODEL_TREE_HH
-#define _MODELTREE_HH
+#define MODEL_TREE_HH
 
 #include <array>
 #include <cassert>

src/NumericalConstants.hh

@@ -17,8 +17,8 @@
  * along with Dynare.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-#ifndef _NUMERICALCONSTANTS_HH
+#ifndef NUMERICAL_CONSTANTS_HH
-#define _NUMERICALCONSTANTS_HH
+#define NUMERICAL_CONSTANTS_HH
 
 #include <map>
 #include <string>

src/NumericalInitialization.hh

@@ -17,8 +17,8 @@
  * along with Dynare.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-#ifndef _NUMERICALINITIALIZATION_HH
+#ifndef NUMERICAL_INITIALIZATION_HH
-#define _NUMERICALINITIALIZATION_HH
+#define NUMERICAL_INITIALIZATION_HH
 
 #include <filesystem>
 #include <map>

src/ParsingDriver.hh

@@ -17,10 +17,10 @@
  * along with Dynare.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-#ifndef _PARSING_DRIVER_HH
+#ifndef PARSING_DRIVER_HH
-#define _PARSING_DRIVER_HH
+#define PARSING_DRIVER_HH
 
-#ifdef _MACRO_DRIVER_HH
+#ifdef MACRO_DRIVER_HH
 # error Impossible to include both ParsingDriver.hh and macro/Driver.hh
 #endif
 
@@ -964,4 +964,4 @@ public:
   }
 };
 
-#endif // ! PARSING_DRIVER_HH
+#endif

src/Shocks.hh

@@ -17,8 +17,8 @@
  * along with Dynare.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-#ifndef _SHOCKS_HH
+#ifndef SHOCKS_HH
-#define _SHOCKS_HH
+#define SHOCKS_HH
 
 #include <map>
 #include <string>

src/Statement.hh

@@ -17,8 +17,8 @@
  * along with Dynare.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-#ifndef _STATEMENT_HH
+#ifndef STATEMENT_HH
-#define _STATEMENT_HH
+#define STATEMENT_HH
 
 #include <map>
 #include <optional>
@@ -335,4 +335,4 @@ private:
   static constexpr bool always_false_v {false};
 };
 
-#endif // ! _STATEMENT_HH
+#endif

src/StaticModel.hh

@@ -17,8 +17,8 @@
  * along with Dynare.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-#ifndef _STATIC_MODEL_HH
+#ifndef STATIC_MODEL_HH
-#define _STATIC_MODEL_HH
+#define STATIC_MODEL_HH
 
 #include <filesystem>
 #include <fstream>

src/SubModel.hh

@@ -17,8 +17,8 @@
  * along with Dynare.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-#ifndef _SUBMODEL_HH
+#ifndef SUB_MODEL_HH
-#define _SUBMODEL_HH
+#define SUB_MODEL_HH
 
 #include <iostream>
 #include <map>

src/SymbolList.hh

@@ -17,8 +17,8 @@
  * along with Dynare.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-#ifndef _SYMBOL_LIST_HH
+#ifndef SYMBOL_LIST_HH
-#define _SYMBOL_LIST_HH
+#define SYMBOL_LIST_HH
 
 #include <algorithm>
 #include <ostream>

src/SymbolTable.hh

@@ -17,8 +17,8 @@
  * along with Dynare.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-#ifndef _SYMBOLTABLE_HH
+#ifndef SYMBOL_TABLE_HH
-#define _SYMBOLTABLE_HH
+#define SYMBOL_TABLE_HH
 
 #include <map>
 #include <optional>

src/VariableDependencyGraph.hh

@@ -17,8 +17,8 @@
  * along with Dynare.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-#ifndef _VARIABLEDEPENDENCYGRAPH_HH
+#ifndef VARIABLE_DEPENDENCY_GRAPH_HH
-#define _VARIABLEDEPENDENCYGRAPH_HH
+#define VARIABLE_DEPENDENCY_GRAPH_HH
 
 #include <map>
 #include <vector>
@@ -94,4 +94,4 @@ private:
   bool suppressionOfVerticesWithLoop(set<int>& feed_back_vertices);
 };
 
-#endif // _VARIABLEDEPENDENCYGRAPH_HH
+#endif

src/WarningConsolidation.hh

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2012-2017 Dynare Team
+ * Copyright © 2012-2023 Dynare Team
  *
  * This file is part of Dynare.
  *
@@ -17,8 +17,8 @@
  * along with Dynare.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-#ifndef _WARNINGCONSOLIDATION_HH
+#ifndef WARNING_CONSOLIDATION_HH
-#define _WARNINGCONSOLIDATION_HH
+#define WARNING_CONSOLIDATION_HH
 
 #include "DynareBisonLocation.hh"
 #include <sstream>

src/macro/Directives.hh

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2019-2020 Dynare Team
+ * Copyright © 2019-2023 Dynare Team
  *
  * This file is part of Dynare.
  *
@@ -17,8 +17,8 @@
  * along with Dynare.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-#ifndef _DIRECTIVES_HH
+#ifndef DIRECTIVES_HH
-#define _DIRECTIVES_HH
+#define DIRECTIVES_HH
 
 #include "Expressions.hh"
 

src/macro/Driver.hh

@@ -17,10 +17,10 @@
  * along with Dynare.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-#ifndef _MACRO_DRIVER_HH
+#ifndef MACRO_DRIVER_HH
-#define _MACRO_DRIVER_HH
+#define MACRO_DRIVER_HH
 
-#ifdef _PARSING_DRIVER_HH
+#ifdef PARSING_DRIVER_HH
 # error Impossible to include both ../ParsingDriver.hh and Driver.hh
 #endif
 

src/macro/Environment.hh

@@ -17,8 +17,8 @@
  * along with Dynare.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-#ifndef _ENVIRONMENT_HH
+#ifndef ENVIRONMENT_HH
-#define _ENVIRONMENT_HH
+#define ENVIRONMENT_HH
 
 #include "ForwardDeclarationsAndEnums.hh"
 

src/macro/Expressions.hh

@@ -17,8 +17,8 @@
  * along with Dynare.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-#ifndef _EXPRESSIONS_HH
+#ifndef EXPRESSIONS_HH
-#define _EXPRESSIONS_HH
+#define EXPRESSIONS_HH
 
 #include "Environment.hh"
 #include "ForwardDeclarationsAndEnums.hh"

src/macro/ForwardDeclarationsAndEnums.hh

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2019 Dynare Team
+ * Copyright © 2019-2023 Dynare Team
  *
  * This file is part of Dynare.
  *
@@ -17,8 +17,8 @@
  * along with Dynare.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-#ifndef _FORWARDDECLARATIONSANDENUMS_HH
+#ifndef FORWARD_DECLARATIONS_AND_ENUMS_HH
-#define _FORWARDDECLARATIONSANDENUMS_HH
+#define FORWARD_DECLARATIONS_AND_ENUMS_HH
 
 #include <memory>