From 2f433c314077318a60c2eb068ac039669e3a2873 Mon Sep 17 00:00:00 2001 From: Tristan Carel Date: Tue, 26 Sep 2023 16:18:02 +0200 Subject: [PATCH] nested namespace in declarations files --- src/ast/ast_common.hpp | 7 ++----- src/codegen/codegen_acc_visitor.hpp | 6 ++---- src/codegen/codegen_compatibility_visitor.hpp | 6 ++---- src/codegen/codegen_cpp_visitor.hpp | 7 ++----- src/codegen/codegen_helper_visitor.hpp | 6 ++---- src/codegen/codegen_info.hpp | 6 ++---- src/codegen/codegen_naming.hpp | 9 ++------- src/codegen/codegen_utils.hpp | 8 ++------ src/lexer/c11_lexer.hpp | 6 ++---- src/lexer/diffeq_lexer.hpp | 6 ++---- src/lexer/nmodl_lexer.hpp | 6 ++---- src/lexer/unit_lexer.hpp | 6 ++---- src/parser/c11_driver.hpp | 6 ++---- src/parser/diffeq_context.hpp | 8 ++------ src/parser/diffeq_driver.hpp | 6 ++---- src/parser/diffeq_helper.hpp | 9 ++------- src/parser/nmodl_driver.hpp | 7 ++----- src/parser/unit_driver.hpp | 6 ++---- src/parser/verbatim_driver.hpp | 6 ++---- src/printer/code_printer.hpp | 7 ++----- src/printer/decl.hpp | 6 ++---- src/printer/json_printer.hpp | 6 ++---- src/printer/nmodl_printer.hpp | 6 ++---- src/pybind/docstrings.hpp | 6 ++---- src/pybind/pybind_utils.hpp | 6 ++---- src/pybind/pyembed.hpp | 6 ++---- src/solver/crout/crout.hpp | 6 ++---- src/solver/newton/newton.hpp | 7 ++----- src/symtab/decl.hpp | 6 ++---- src/symtab/symbol_properties.hpp | 10 ++-------- src/symtab/symbol_table.hpp | 6 ++---- src/units/units.hpp | 7 ++----- src/utils/common_utils.hpp | 6 ++---- src/utils/perf_stat.hpp | 6 ++---- src/utils/string_utils.hpp | 6 ++---- src/utils/table_data.hpp | 6 ++---- src/visitors/after_cvode_to_cnexp_visitor.hpp | 6 ++---- src/visitors/constant_folder_visitor.hpp | 6 ++---- src/visitors/defuse_analyze_visitor.hpp | 6 ++---- src/visitors/global_var_visitor.hpp | 6 ++---- src/visitors/implicit_argument_visitor.hpp | 6 ++---- src/visitors/indexedname_visitor.hpp | 6 ++---- src/visitors/inline_visitor.hpp | 6 ++---- src/visitors/kinetic_block_visitor.hpp | 6 ++---- src/visitors/local_to_assigned_visitor.hpp | 6 ++---- src/visitors/local_var_rename_visitor.hpp | 6 ++---- src/visitors/localize_visitor.hpp | 6 ++---- src/visitors/loop_unroll_visitor.hpp | 6 ++---- src/visitors/neuron_solve_visitor.hpp | 6 ++---- src/visitors/perf_visitor.hpp | 6 ++---- src/visitors/rename_visitor.hpp | 6 ++---- src/visitors/semantic_analysis_visitor.hpp | 6 ++---- src/visitors/solve_block_visitor.hpp | 6 ++---- src/visitors/steadystate_visitor.hpp | 6 ++---- src/visitors/sympy_conductance_visitor.hpp | 7 ++----- src/visitors/sympy_replace_solutions_visitor.hpp | 6 ++---- src/visitors/sympy_solver_visitor.hpp | 6 ++---- src/visitors/symtab_visitor_helper.hpp | 6 ++---- src/visitors/units_visitor.hpp | 6 ++---- src/visitors/var_usage_visitor.hpp | 6 ++---- src/visitors/verbatim_var_rename_visitor.hpp | 6 ++---- src/visitors/verbatim_visitor.hpp | 6 ++---- 62 files changed, 124 insertions(+), 269 deletions(-) diff --git a/src/ast/ast_common.hpp b/src/ast/ast_common.hpp index 96fd6a7f7d..a167cd9624 100644 --- a/src/ast/ast_common.hpp +++ b/src/ast/ast_common.hpp @@ -23,10 +23,8 @@ #include "symtab/symbol_table.hpp" #include "visitors/visitor.hpp" -namespace nmodl { - /// Abstract Syntax Tree (AST) related implementations -namespace ast { +namespace nmodl::ast { /** * @defgroup ast AST Implementation @@ -96,5 +94,4 @@ static const std::string ReactionOpNames[] = {"<->", "<<", "->"}; /** @} */ // end of ast_prop -} // namespace ast -} // namespace nmodl +} // namespace nmodl::ast diff --git a/src/codegen/codegen_acc_visitor.hpp b/src/codegen/codegen_acc_visitor.hpp index 1a3f60503f..c734efe619 100644 --- a/src/codegen/codegen_acc_visitor.hpp +++ b/src/codegen/codegen_acc_visitor.hpp @@ -15,8 +15,7 @@ #include "codegen/codegen_cpp_visitor.hpp" -namespace nmodl { -namespace codegen { +namespace nmodl::codegen { /** * \addtogroup codegen_backends @@ -151,5 +150,4 @@ class CodegenAccVisitor: public CodegenCppVisitor { /** \} */ // end of codegen_backends -} // namespace codegen -} // namespace nmodl +} // namespace nmodl::codegen diff --git a/src/codegen/codegen_compatibility_visitor.hpp b/src/codegen/codegen_compatibility_visitor.hpp index 311c540efb..0a3f2a5947 100644 --- a/src/codegen/codegen_compatibility_visitor.hpp +++ b/src/codegen/codegen_compatibility_visitor.hpp @@ -22,8 +22,7 @@ #include "utils/logger.hpp" #include "visitors/ast_visitor.hpp" -namespace nmodl { -namespace codegen { +namespace nmodl::codegen { using namespace ast; @@ -157,5 +156,4 @@ class CodegenCompatibilityVisitor: public visitor::AstVisitor { /** \} */ // end of codegen_backends -} // namespace codegen -} // namespace nmodl +} // namespace nmodl::codegen diff --git a/src/codegen/codegen_cpp_visitor.hpp b/src/codegen/codegen_cpp_visitor.hpp index ee0344058c..24e933a80e 100644 --- a/src/codegen/codegen_cpp_visitor.hpp +++ b/src/codegen/codegen_cpp_visitor.hpp @@ -33,9 +33,7 @@ /// encapsulates code generation backend implementations -namespace nmodl { - -namespace codegen { +namespace nmodl::codegen { /** * \defgroup codegen Code Generation Implementation @@ -1865,5 +1863,4 @@ void CodegenCppVisitor::print_function_declaration(const T& node, const std::str /** \} */ // end of codegen_backends -} // namespace codegen -} // namespace nmodl +} // namespace nmodl::codegen diff --git a/src/codegen/codegen_helper_visitor.hpp b/src/codegen/codegen_helper_visitor.hpp index b960bdc06f..daf483e461 100644 --- a/src/codegen/codegen_helper_visitor.hpp +++ b/src/codegen/codegen_helper_visitor.hpp @@ -18,8 +18,7 @@ #include "symtab/symbol_table.hpp" #include "visitors/ast_visitor.hpp" -namespace nmodl { -namespace codegen { +namespace nmodl::codegen { /** * @addtogroup codegen_details @@ -119,5 +118,4 @@ class CodegenHelperVisitor: public visitor::ConstAstVisitor { /** @} */ // end of codegen_details -} // namespace codegen -} // namespace nmodl +} // namespace nmodl::codegen diff --git a/src/codegen/codegen_info.hpp b/src/codegen/codegen_info.hpp index 67cf6c9bb4..b3bcb19bf9 100644 --- a/src/codegen/codegen_info.hpp +++ b/src/codegen/codegen_info.hpp @@ -20,8 +20,7 @@ #include "ast/ast.hpp" #include "symtab/symbol_table.hpp" -namespace nmodl { -namespace codegen { +namespace nmodl::codegen { /** * \addtogroup codegen_details @@ -439,5 +438,4 @@ struct CodegenInfo { /** \} */ // end of codegen_backends -} // namespace codegen -} // namespace nmodl +} // namespace nmodl::codegen diff --git a/src/codegen/codegen_naming.hpp b/src/codegen/codegen_naming.hpp index 3af8a49e88..c56af84218 100644 --- a/src/codegen/codegen_naming.hpp +++ b/src/codegen/codegen_naming.hpp @@ -11,10 +11,7 @@ #include -namespace nmodl { -namespace codegen { -/// different variable names used in code generation -namespace naming { +namespace nmodl::codegen::naming { /// nmodl language version /// @todo : should be moved from codegen to global scope @@ -179,6 +176,4 @@ static constexpr char ION_VARNAME_PREFIX[] = "ion_"; {"_tqitem", "tqitem"}}; // clang-format on -} // namespace naming -} // namespace codegen -} // namespace nmodl +} // namespace nmodl::codegen::naming diff --git a/src/codegen/codegen_utils.hpp b/src/codegen/codegen_utils.hpp index 4c910b36b5..f817eb8c58 100644 --- a/src/codegen/codegen_utils.hpp +++ b/src/codegen/codegen_utils.hpp @@ -15,9 +15,7 @@ #include -namespace nmodl { -namespace codegen { -namespace utils { +namespace nmodl::codegen::utils { /** * Handles the double constants format being printed in the generated code. @@ -46,6 +44,4 @@ std::string format_double_string(const std::string& s_value); template std::string format_float_string(const std::string& s_value); -} // namespace utils -} // namespace codegen -} // namespace nmodl +} // namespace nmodl::codegen::utils diff --git a/src/lexer/c11_lexer.hpp b/src/lexer/c11_lexer.hpp index b95c1baf95..117f9d7b2e 100644 --- a/src/lexer/c11_lexer.hpp +++ b/src/lexer/c11_lexer.hpp @@ -28,8 +28,7 @@ #include "FlexLexer.h" #endif -namespace nmodl { -namespace parser { +namespace nmodl::parser { /** * @addtogroup lexer @@ -108,5 +107,4 @@ class CLexer: public CFlexLexer { /** @} */ // end of lexer -} // namespace parser -} // namespace nmodl +} // namespace nmodl::parser diff --git a/src/lexer/diffeq_lexer.hpp b/src/lexer/diffeq_lexer.hpp index bf6202aac7..ef39abe50e 100644 --- a/src/lexer/diffeq_lexer.hpp +++ b/src/lexer/diffeq_lexer.hpp @@ -28,8 +28,7 @@ #include "FlexLexer.h" #endif -namespace nmodl { -namespace parser { +namespace nmodl::parser { /** * @addtogroup lexer @@ -80,5 +79,4 @@ class DiffeqLexer: public DiffEqFlexLexer { /** @} */ // end of lexer -} // namespace parser -} // namespace nmodl +} // namespace nmodl::parser diff --git a/src/lexer/nmodl_lexer.hpp b/src/lexer/nmodl_lexer.hpp index e89db2a04c..1a135800cc 100644 --- a/src/lexer/nmodl_lexer.hpp +++ b/src/lexer/nmodl_lexer.hpp @@ -35,8 +35,7 @@ #include "FlexLexer.h" #endif -namespace nmodl { -namespace parser { +namespace nmodl::parser { /** * @defgroup lexer Lexer Implementation @@ -154,5 +153,4 @@ class NmodlLexer: public NmodlFlexLexer { /** @} */ // end of lexer -} // namespace parser -} // namespace nmodl +} // namespace nmodl::parser diff --git a/src/lexer/unit_lexer.hpp b/src/lexer/unit_lexer.hpp index c7651c3137..839b017a44 100644 --- a/src/lexer/unit_lexer.hpp +++ b/src/lexer/unit_lexer.hpp @@ -28,8 +28,7 @@ #include "FlexLexer.h" #endif -namespace nmodl { -namespace parser { +namespace nmodl::parser { /** * @addtogroup lexer @@ -83,5 +82,4 @@ class UnitLexer: public UnitFlexLexer { virtual UnitParser::symbol_type next_token(); }; -} // namespace parser -} // namespace nmodl +} // namespace nmodl::parser diff --git a/src/parser/c11_driver.hpp b/src/parser/c11_driver.hpp index 555f6a5050..c9558266e2 100644 --- a/src/parser/c11_driver.hpp +++ b/src/parser/c11_driver.hpp @@ -14,8 +14,7 @@ #include -namespace nmodl { -namespace parser { +namespace nmodl::parser { /// flex generated scanner class (extends base lexer class of flex) class CLexer; @@ -109,5 +108,4 @@ class CDriver { /** \} */ // end of parser -} // namespace parser -} // namespace nmodl +} // namespace nmodl::parser diff --git a/src/parser/diffeq_context.hpp b/src/parser/diffeq_context.hpp index 08fde3a300..eb83d5eeb0 100644 --- a/src/parser/diffeq_context.hpp +++ b/src/parser/diffeq_context.hpp @@ -10,9 +10,7 @@ #include #include -namespace nmodl { -namespace parser { -namespace diffeq { +namespace nmodl::parser::diffeq { /** * \class Term @@ -127,6 +125,4 @@ class DiffEqContext { void print() const; }; -} // namespace diffeq -} // namespace parser -} // namespace nmodl +} // namespace nmodl::parser::diffeq diff --git a/src/parser/diffeq_driver.hpp b/src/parser/diffeq_driver.hpp index 2162cf41c9..a247913dd8 100644 --- a/src/parser/diffeq_driver.hpp +++ b/src/parser/diffeq_driver.hpp @@ -12,8 +12,7 @@ #include "parser/diffeq_context.hpp" -namespace nmodl { -namespace parser { +namespace nmodl::parser { /// flex generated scanner class (extends base lexer class of flex) class DiffeqlLexer; @@ -60,5 +59,4 @@ class DiffeqDriver { /** @} */ // end of parser -} // namespace parser -} // namespace nmodl +} // namespace nmodl::parser diff --git a/src/parser/diffeq_helper.hpp b/src/parser/diffeq_helper.hpp index c04111d788..55041625a8 100644 --- a/src/parser/diffeq_helper.hpp +++ b/src/parser/diffeq_helper.hpp @@ -9,9 +9,6 @@ #include "parser/diffeq_context.hpp" -namespace nmodl { -namespace parser { - /** * \brief Helper functions for solving differential equations * @@ -23,7 +20,7 @@ namespace parser { * Need to revisit this, may be using better library like symengine * altogether. */ -namespace diffeq { + namespace nmodl::parser::diffeq { /// operators beign supported as part of binary expressions enum class MathOp { add = 1, sub, mul, div }; @@ -175,6 +172,4 @@ inline Term eval_derivative(const Term& first, return solution; } -} // namespace diffeq -} // namespace parser -} // namespace nmodl +} // namespace nmodl::parser::diffeq diff --git a/src/parser/nmodl_driver.hpp b/src/parser/nmodl_driver.hpp index 217879b053..304b0d2e1c 100644 --- a/src/parser/nmodl_driver.hpp +++ b/src/parser/nmodl_driver.hpp @@ -23,9 +23,7 @@ /// encapsulates everything related to NMODL code generation framework -namespace nmodl { -/// encapsulate lexer and parsers implementations -namespace parser { +namespace nmodl::parser { /** * \defgroup parser Parser Implementation @@ -162,5 +160,4 @@ class NmodlDriver { /** \} */ // end of parser -} // namespace parser -} // namespace nmodl +} // namespace nmodl::parser diff --git a/src/parser/unit_driver.hpp b/src/parser/unit_driver.hpp index 31f882e731..ee939ceacf 100644 --- a/src/parser/unit_driver.hpp +++ b/src/parser/unit_driver.hpp @@ -14,8 +14,7 @@ #include #include -namespace nmodl { -namespace parser { +namespace nmodl::parser { /// flex generated scanner class (extends base lexer class of flex) class UnitLexer; @@ -75,5 +74,4 @@ class UnitDriver { } }; -} // namespace parser -} // namespace nmodl +} // namespace nmodl::parser diff --git a/src/parser/verbatim_driver.hpp b/src/parser/verbatim_driver.hpp index bd005879af..d7b18d716b 100644 --- a/src/parser/verbatim_driver.hpp +++ b/src/parser/verbatim_driver.hpp @@ -10,8 +10,7 @@ #include -namespace nmodl { -namespace parser { +namespace nmodl::parser { /** * @addtogroup parser @@ -47,8 +46,7 @@ class VerbatimDriver { /** @} */ // end of parser -} // namespace parser -} // namespace nmodl +} // namespace nmodl::parser int Verbatim_parse(nmodl::parser::VerbatimDriver*); diff --git a/src/printer/code_printer.hpp b/src/printer/code_printer.hpp index 226562fff1..6716072d8a 100644 --- a/src/printer/code_printer.hpp +++ b/src/printer/code_printer.hpp @@ -22,9 +22,7 @@ #include #include -namespace nmodl { -/// implementation of various printers -namespace printer { +namespace nmodl::printer { /** * @defgroup printer Code Printers @@ -131,5 +129,4 @@ class CodePrinter { /** @} */ // end of printer -} // namespace printer -} // namespace nmodl +} // namespace nmodl::printer diff --git a/src/printer/decl.hpp b/src/printer/decl.hpp index 041b2114cb..c63d03b285 100644 --- a/src/printer/decl.hpp +++ b/src/printer/decl.hpp @@ -12,10 +12,8 @@ * \brief Forward references of symbols defined in namespace nmodl::printer */ -namespace nmodl { -namespace printer { +namespace nmodl::printer { class JSONPrinter; -} -} // namespace nmodl +} // namespace nmodl::printer diff --git a/src/printer/json_printer.hpp b/src/printer/json_printer.hpp index 536c112352..6f6ad347dc 100644 --- a/src/printer/json_printer.hpp +++ b/src/printer/json_printer.hpp @@ -18,8 +18,7 @@ #include #include -namespace nmodl { -namespace printer { +namespace nmodl::printer { using json = nlohmann::json; @@ -100,5 +99,4 @@ class JSONPrinter { /** @} */ // end of printer -} // namespace printer -} // namespace nmodl +} // namespace nmodl::printer diff --git a/src/printer/nmodl_printer.hpp b/src/printer/nmodl_printer.hpp index 5d00725465..544cdd1346 100644 --- a/src/printer/nmodl_printer.hpp +++ b/src/printer/nmodl_printer.hpp @@ -17,8 +17,7 @@ #include #include -namespace nmodl { -namespace printer { +namespace nmodl::printer { /** * @addtogroup printer @@ -70,5 +69,4 @@ class NMODLPrinter { /** @} */ // end of printer -} // namespace printer -} // namespace nmodl +} // namespace nmodl::printer diff --git a/src/pybind/docstrings.hpp b/src/pybind/docstrings.hpp index 7fa8274826..871a0c3108 100644 --- a/src/pybind/docstrings.hpp +++ b/src/pybind/docstrings.hpp @@ -7,8 +7,7 @@ #pragma once -namespace nmodl { -namespace docstring { +namespace nmodl::docstring { constexpr const char* binary_op_enum() { return R"( @@ -170,5 +169,4 @@ constexpr const char* parent_property() { )"; } -} // namespace docstring -} // namespace nmodl +} // namespace nmodl::docstring diff --git a/src/pybind/pybind_utils.hpp b/src/pybind/pybind_utils.hpp index 43ad61dccd..ed14ff91bd 100644 --- a/src/pybind/pybind_utils.hpp +++ b/src/pybind/pybind_utils.hpp @@ -13,8 +13,7 @@ #include -namespace pybind11 { -namespace detail { +namespace pybind11::detail { template struct CopyFromPython { @@ -88,8 +87,7 @@ class pythonibuf: public std::streambuf { setg(end, end, end); } }; -} // namespace detail -} // namespace pybind11 +} // namespace pybind11::details class VisitorOStreamResources { protected: diff --git a/src/pybind/pyembed.hpp b/src/pybind/pyembed.hpp index 2199d6b04c..f8f2576d44 100644 --- a/src/pybind/pyembed.hpp +++ b/src/pybind/pyembed.hpp @@ -14,8 +14,7 @@ #include #include -namespace nmodl { -namespace pybind_wrappers { +namespace nmodl::pybind_wrappers { struct PythonExecutor { @@ -182,5 +181,4 @@ class EmbeddedPythonLoader { pybind_wrap_api init_pybind_wrap_api() noexcept; -} // namespace pybind_wrappers -} // namespace nmodl +} // namespace nmodl::pybind_wrappers diff --git a/src/solver/crout/crout.hpp b/src/solver/crout/crout.hpp index cf45043b72..3c5b018494 100644 --- a/src/solver/crout/crout.hpp +++ b/src/solver/crout/crout.hpp @@ -23,8 +23,7 @@ #include "coreneuron/utils/offload.hpp" #endif -namespace nmodl { -namespace crout { +namespace nmodl::crout { /** * \brief Crout matrix decomposition : in-place LU Decomposition of matrix a. @@ -203,5 +202,4 @@ nrn_pragma_omp(end declare target) #undef y_ #undef b_ -} // namespace crout -} // namespace nmodl +} // namespace nmodl::crout diff --git a/src/solver/newton/newton.hpp b/src/solver/newton/newton.hpp index 973b4cd332..0da5e7eec0 100644 --- a/src/solver/newton/newton.hpp +++ b/src/solver/newton/newton.hpp @@ -20,9 +20,7 @@ #include #include -namespace nmodl { -/// newton solver implementations -namespace newton { +namespace nmodl::newton { /** * @defgroup solver Solver Implementation @@ -237,5 +235,4 @@ EIGEN_DEVICE_FUNC int newton_solver(Eigen::Matrix& X, /** @} */ // end of solver -} // namespace newton -} // namespace nmodl +} // namespace nmodl::newton diff --git a/src/symtab/decl.hpp b/src/symtab/decl.hpp index 119ebf0f89..d287951600 100644 --- a/src/symtab/decl.hpp +++ b/src/symtab/decl.hpp @@ -10,11 +10,9 @@ /// \file /// \brief Forward declarations of symbols in namespace nmodl::symtab -namespace nmodl { -namespace symtab { +namespace nmodl::symtab { class Symbol; class SymbolTable; -} // namespace symtab -} // namespace nmodl +} // namespace nmodl::symtab diff --git a/src/symtab/symbol_properties.hpp b/src/symtab/symbol_properties.hpp index dad35d8b60..e5b29a7c9d 100644 --- a/src/symtab/symbol_properties.hpp +++ b/src/symtab/symbol_properties.hpp @@ -17,11 +17,7 @@ #include "utils/string_utils.hpp" -namespace nmodl { -namespace symtab { - -/// %Symbol information -namespace syminfo { +namespace nmodl::symtab::syminfo { /// \todo Error with pybind if std::underlying_typ is used using enum_type = long long; @@ -285,6 +281,4 @@ std::string to_string(const T& obj) { return text; } -} // namespace syminfo -} // namespace symtab -} // namespace nmodl +} // namespace nmodl::symtab::syminfo diff --git a/src/symtab/symbol_table.hpp b/src/symtab/symbol_table.hpp index 9b64157f8a..dc2794bebb 100644 --- a/src/symtab/symbol_table.hpp +++ b/src/symtab/symbol_table.hpp @@ -21,8 +21,7 @@ #include "symtab/symbol.hpp" -namespace nmodl { -namespace symtab { +namespace nmodl::symtab { /** @@ -294,5 +293,4 @@ class ModelSymbolTable { /** @} */ // end of sym_tab -} // namespace symtab -} // namespace nmodl +} // namespace nmodl::symtab diff --git a/src/units/units.hpp b/src/units/units.hpp index 6c770bde79..7e78aad3b3 100644 --- a/src/units/units.hpp +++ b/src/units/units.hpp @@ -27,10 +27,8 @@ #include #include - -namespace nmodl { /// encapsulates unit database and tables implementation -namespace units { +namespace nmodl::units { /** * @defgroup units Unit Implementation @@ -292,5 +290,4 @@ class UnitTable { /** @} */ // end of units -} // namespace units -} // namespace nmodl +} // namespace nmodl::units diff --git a/src/utils/common_utils.hpp b/src/utils/common_utils.hpp index 2508990917..be0eba7ede 100644 --- a/src/utils/common_utils.hpp +++ b/src/utils/common_utils.hpp @@ -24,9 +24,8 @@ * \brief Common utility functions for file/dir manipulation */ -namespace nmodl { /// file/string manipulation functions -namespace utils { +namespace nmodl::utils { /** * @defgroup utils Utility Implementation @@ -130,5 +129,4 @@ class SingletonRandomString { /** @} */ // end of utils -} // namespace utils -} // namespace nmodl +} // namespace nmodl::utils diff --git a/src/utils/perf_stat.hpp b/src/utils/perf_stat.hpp index bcb76de474..c273afb12d 100644 --- a/src/utils/perf_stat.hpp +++ b/src/utils/perf_stat.hpp @@ -16,8 +16,7 @@ #include #include -namespace nmodl { -namespace utils { +namespace nmodl::utils { /** * @addtogroup utils @@ -108,5 +107,4 @@ struct PerfStat { /** @} */ // end of utils -} // namespace utils -} // namespace nmodl +} // namespace nmodl::utils diff --git a/src/utils/string_utils.hpp b/src/utils/string_utils.hpp index 749ee84c0f..a0176ec708 100644 --- a/src/utils/string_utils.hpp +++ b/src/utils/string_utils.hpp @@ -22,9 +22,8 @@ #include #include -namespace nmodl { /// string utility functions -namespace stringutils { +namespace nmodl::stringutils { /** * \addtogroup utils @@ -182,5 +181,4 @@ std::string to_string(double value, const std::string& format_spec = "{:.16g}"); /** \} */ // end of utils -} // namespace stringutils -} // namespace nmodl +} // namespace nmodl::stringutils diff --git a/src/utils/table_data.hpp b/src/utils/table_data.hpp index 7129a8c974..0f8adf35ed 100644 --- a/src/utils/table_data.hpp +++ b/src/utils/table_data.hpp @@ -18,8 +18,7 @@ #include "utils/string_utils.hpp" -namespace nmodl { -namespace utils { +namespace nmodl::utils { /** * @addtogroup utils @@ -55,5 +54,4 @@ struct TableData { /** @} */ // end of utils -} // namespace utils -} // namespace nmodl +} // namespace nmodl::utils diff --git a/src/visitors/after_cvode_to_cnexp_visitor.hpp b/src/visitors/after_cvode_to_cnexp_visitor.hpp index 182a01fb8b..33fdaad289 100644 --- a/src/visitors/after_cvode_to_cnexp_visitor.hpp +++ b/src/visitors/after_cvode_to_cnexp_visitor.hpp @@ -19,8 +19,7 @@ #include "visitors/ast_visitor.hpp" -namespace nmodl { -namespace visitor { +namespace nmodl::visitor { /** * \addtogroup visitor_classes @@ -50,5 +49,4 @@ class AfterCVodeToCnexpVisitor: public AstVisitor { /** \} */ // end of visitor_classes -} // namespace visitor -} // namespace nmodl +} // namespace nmodl::visitor diff --git a/src/visitors/constant_folder_visitor.hpp b/src/visitors/constant_folder_visitor.hpp index 6c9e735c53..2b97ffd0e5 100644 --- a/src/visitors/constant_folder_visitor.hpp +++ b/src/visitors/constant_folder_visitor.hpp @@ -22,8 +22,7 @@ #include "visitors/ast_visitor.hpp" -namespace nmodl { -namespace visitor { +namespace nmodl::visitor { /** * @addtogroup visitor_classes @@ -59,5 +58,4 @@ class ConstantFolderVisitor: public AstVisitor { /** @} */ // end of visitor_classes -} // namespace visitor -} // namespace nmodl +} // namespace nmodl::visitor diff --git a/src/visitors/defuse_analyze_visitor.hpp b/src/visitors/defuse_analyze_visitor.hpp index a36ac9e2f3..bf2eec918f 100644 --- a/src/visitors/defuse_analyze_visitor.hpp +++ b/src/visitors/defuse_analyze_visitor.hpp @@ -21,8 +21,7 @@ #include "visitors/visitor_utils.hpp" -namespace nmodl { -namespace visitor { +namespace nmodl::visitor { /// Represent a state in Def-Use chain enum class DUState { @@ -312,5 +311,4 @@ class DefUseAnalyzeVisitor: protected ConstAstVisitor { /** @} */ // end of visitor_classes -} // namespace visitor -} // namespace nmodl +} // namespace nmodl::visitor diff --git a/src/visitors/global_var_visitor.hpp b/src/visitors/global_var_visitor.hpp index 8cecb5e4ce..73eebd793a 100644 --- a/src/visitors/global_var_visitor.hpp +++ b/src/visitors/global_var_visitor.hpp @@ -19,8 +19,7 @@ #include "visitors/ast_visitor.hpp" -namespace nmodl { -namespace visitor { +namespace nmodl::visitor { /** * \addtogroup visitor_classes @@ -87,5 +86,4 @@ class GlobalToRangeVisitor: public AstVisitor { /** \} */ // end of visitor_classes -} // namespace visitor -} // namespace nmodl +} // namespace nmodl::visitor diff --git a/src/visitors/implicit_argument_visitor.hpp b/src/visitors/implicit_argument_visitor.hpp index effca8793c..63be545cac 100644 --- a/src/visitors/implicit_argument_visitor.hpp +++ b/src/visitors/implicit_argument_visitor.hpp @@ -15,8 +15,7 @@ #include "visitors/ast_visitor.hpp" -namespace nmodl { -namespace visitor { +namespace nmodl::visitor { /** * \addtogroup visitor_classes @@ -38,5 +37,4 @@ struct ImplicitArgumentVisitor: public AstVisitor { /** \} */ // end of visitor_classes -} // namespace visitor -} // namespace nmodl +} // namespace nmodl::visitor diff --git a/src/visitors/indexedname_visitor.hpp b/src/visitors/indexedname_visitor.hpp index 9d38b6db33..81e2134fcb 100644 --- a/src/visitors/indexedname_visitor.hpp +++ b/src/visitors/indexedname_visitor.hpp @@ -20,8 +20,7 @@ #include "ast/program.hpp" #include "visitors/ast_visitor.hpp" -namespace nmodl { -namespace visitor { +namespace nmodl::visitor { /** * \addtogroup visitor_classes @@ -64,5 +63,4 @@ class IndexedNameVisitor: public AstVisitor { /** \} */ // end of visitor_classes -} // namespace visitor -} // namespace nmodl +} // namespace nmodl::visitor diff --git a/src/visitors/inline_visitor.hpp b/src/visitors/inline_visitor.hpp index 9a728da04b..84659c1a26 100644 --- a/src/visitors/inline_visitor.hpp +++ b/src/visitors/inline_visitor.hpp @@ -18,8 +18,7 @@ #include "symtab/decl.hpp" #include "visitors/ast_visitor.hpp" -namespace nmodl { -namespace visitor { +namespace nmodl::visitor { /** * \addtogroup visitor_classes @@ -198,5 +197,4 @@ class InlineVisitor: public AstVisitor { /** \} */ // end of visitor_classes -} // namespace visitor -} // namespace nmodl +} // namespace nmodl::visitor diff --git a/src/visitors/kinetic_block_visitor.hpp b/src/visitors/kinetic_block_visitor.hpp index 0f67260594..9ae057aef0 100644 --- a/src/visitors/kinetic_block_visitor.hpp +++ b/src/visitors/kinetic_block_visitor.hpp @@ -20,8 +20,7 @@ #include "visitors/ast_visitor.hpp" -namespace nmodl { -namespace visitor { +namespace nmodl::visitor { /** * \addtogroup visitor_classes @@ -151,5 +150,4 @@ class KineticBlockVisitor: public AstVisitor { /** \} */ // end of visitor_classes -} // namespace visitor -} // namespace nmodl +} // namespace nmodl::visitor diff --git a/src/visitors/local_to_assigned_visitor.hpp b/src/visitors/local_to_assigned_visitor.hpp index 4e757718ef..b68b592300 100644 --- a/src/visitors/local_to_assigned_visitor.hpp +++ b/src/visitors/local_to_assigned_visitor.hpp @@ -14,8 +14,7 @@ #include "visitors/ast_visitor.hpp" -namespace nmodl { -namespace visitor { +namespace nmodl::visitor { /** * @addtogroup visitor_classes @@ -79,5 +78,4 @@ class LocalToAssignedVisitor: public AstVisitor { /** \} */ // end of visitor_classes -} // namespace visitor -} // namespace nmodl +} // namespace nmodl::visitor diff --git a/src/visitors/local_var_rename_visitor.hpp b/src/visitors/local_var_rename_visitor.hpp index a73196e194..2af0c67d91 100644 --- a/src/visitors/local_var_rename_visitor.hpp +++ b/src/visitors/local_var_rename_visitor.hpp @@ -18,8 +18,7 @@ #include "symtab/decl.hpp" #include "visitors/ast_visitor.hpp" -namespace nmodl { -namespace visitor { +namespace nmodl::visitor { /** * \addtogroup visitor_classes @@ -77,5 +76,4 @@ class LocalVarRenameVisitor: public AstVisitor { /** \} */ // end of visitor_classes -} // namespace visitor -} // namespace nmodl +} // namespace nmodl::visitor diff --git a/src/visitors/localize_visitor.hpp b/src/visitors/localize_visitor.hpp index 821e072fe2..577f3580c2 100644 --- a/src/visitors/localize_visitor.hpp +++ b/src/visitors/localize_visitor.hpp @@ -18,8 +18,7 @@ #include "visitors/ast_visitor.hpp" -namespace nmodl { -namespace visitor { +namespace nmodl::visitor { /** * \addtogroup visitor_classes @@ -104,5 +103,4 @@ class LocalizeVisitor: public ConstAstVisitor { /** \} */ // end of visitor_classes -} // namespace visitor -} // namespace nmodl +} // namespace nmodl::visitor diff --git a/src/visitors/loop_unroll_visitor.hpp b/src/visitors/loop_unroll_visitor.hpp index 054dfb89b9..9d2f464a6e 100644 --- a/src/visitors/loop_unroll_visitor.hpp +++ b/src/visitors/loop_unroll_visitor.hpp @@ -16,8 +16,7 @@ #include "visitors/ast_visitor.hpp" -namespace nmodl { -namespace visitor { +namespace nmodl::visitor { /** * \addtogroup visitor_classes @@ -65,5 +64,4 @@ class LoopUnrollVisitor: public AstVisitor { /** \} */ // end of visitor_classes -} // namespace visitor -} // namespace nmodl +} // namespace nmodl::visitor diff --git a/src/visitors/neuron_solve_visitor.hpp b/src/visitors/neuron_solve_visitor.hpp index 85029ed43e..e1b14b3c37 100644 --- a/src/visitors/neuron_solve_visitor.hpp +++ b/src/visitors/neuron_solve_visitor.hpp @@ -19,8 +19,7 @@ #include "visitors/ast_visitor.hpp" -namespace nmodl { -namespace visitor { +namespace nmodl::visitor { /** * \addtogroup solver @@ -73,5 +72,4 @@ class NeuronSolveVisitor: public AstVisitor { /** \} */ // end of visitor_classes -} // namespace visitor -} // namespace nmodl +} // namespace nmodl::visitor diff --git a/src/visitors/perf_visitor.hpp b/src/visitors/perf_visitor.hpp index 7fa0c01d3f..8b44318151 100644 --- a/src/visitors/perf_visitor.hpp +++ b/src/visitors/perf_visitor.hpp @@ -22,8 +22,7 @@ #include "visitors/ast_visitor.hpp" -namespace nmodl { -namespace visitor { +namespace nmodl::visitor { /** * \addtogroup visitor_classes @@ -253,5 +252,4 @@ class PerfVisitor: public ConstAstVisitor { /** \} */ // end of visitor_classes -} // namespace visitor -} // namespace nmodl +} // namespace nmodl::visitor diff --git a/src/visitors/rename_visitor.hpp b/src/visitors/rename_visitor.hpp index 3bd62fb016..bb8fcdf14d 100644 --- a/src/visitors/rename_visitor.hpp +++ b/src/visitors/rename_visitor.hpp @@ -19,8 +19,7 @@ #include "visitors/ast_visitor.hpp" -namespace nmodl { -namespace visitor { +namespace nmodl::visitor { /** * \addtogroup visitor_classes @@ -110,5 +109,4 @@ class RenameVisitor: public ConstAstVisitor { /** \} */ // end of visitor_classes -} // namespace visitor -} // namespace nmodl +} // namespace nmodl::visitor diff --git a/src/visitors/semantic_analysis_visitor.hpp b/src/visitors/semantic_analysis_visitor.hpp index 1deffcb154..4c43e10ba1 100644 --- a/src/visitors/semantic_analysis_visitor.hpp +++ b/src/visitors/semantic_analysis_visitor.hpp @@ -35,8 +35,7 @@ #include "ast/ast.hpp" #include "visitors/ast_visitor.hpp" -namespace nmodl { -namespace visitor { +namespace nmodl::visitor { class SemanticAnalysisVisitor: public ConstAstVisitor { private: @@ -90,5 +89,4 @@ class SemanticAnalysisVisitor: public ConstAstVisitor { /** \} */ // end of visitor_classes -} // namespace visitor -} // namespace nmodl +} // namespace nmodl::visitor diff --git a/src/visitors/solve_block_visitor.hpp b/src/visitors/solve_block_visitor.hpp index a22509d130..e10763b53b 100644 --- a/src/visitors/solve_block_visitor.hpp +++ b/src/visitors/solve_block_visitor.hpp @@ -15,8 +15,7 @@ #include "symtab/decl.hpp" #include "visitors/ast_visitor.hpp" -namespace nmodl { -namespace visitor { +namespace nmodl::visitor { /** * \addtogroup visitor_classes @@ -52,5 +51,4 @@ class SolveBlockVisitor: public AstVisitor { /** \} */ // end of visitor_classes -} // namespace visitor -} // namespace nmodl +} // namespace nmodl::visitor diff --git a/src/visitors/steadystate_visitor.hpp b/src/visitors/steadystate_visitor.hpp index 6b4e3432ad..55ffc28ef6 100644 --- a/src/visitors/steadystate_visitor.hpp +++ b/src/visitors/steadystate_visitor.hpp @@ -14,8 +14,7 @@ #include "visitors/ast_visitor.hpp" -namespace nmodl { -namespace visitor { +namespace nmodl::visitor { /** * @addtogroup visitor_classes @@ -69,5 +68,4 @@ class SteadystateVisitor: public AstVisitor { /** @} */ // end of visitor_classes -} // namespace visitor -} // namespace nmodl +} // namespace nmodl::visitor diff --git a/src/visitors/sympy_conductance_visitor.hpp b/src/visitors/sympy_conductance_visitor.hpp index cb76bdf2fd..e891f87d85 100644 --- a/src/visitors/sympy_conductance_visitor.hpp +++ b/src/visitors/sympy_conductance_visitor.hpp @@ -18,9 +18,7 @@ #include "visitors/ast_visitor.hpp" -namespace nmodl { - -namespace visitor { +namespace nmodl::visitor { /** * @addtogroup visitor_classes @@ -101,5 +99,4 @@ class SympyConductanceVisitor: public AstVisitor { /** @} */ // end of visitor_classes -} // namespace visitor -} // namespace nmodl +} // namespace nmodl::visitor diff --git a/src/visitors/sympy_replace_solutions_visitor.hpp b/src/visitors/sympy_replace_solutions_visitor.hpp index 42bc4da2d0..d3b7e95983 100644 --- a/src/visitors/sympy_replace_solutions_visitor.hpp +++ b/src/visitors/sympy_replace_solutions_visitor.hpp @@ -21,8 +21,7 @@ #include #include -namespace nmodl { -namespace visitor { +namespace nmodl::visitor { /** * @addtogroup visitor_classes @@ -498,5 +497,4 @@ class SympyReplaceSolutionsVisitor: public AstVisitor { /** @} */ // end of visitor_classes -} // namespace visitor -} // namespace nmodl +} // namespace nmodl::visitor diff --git a/src/visitors/sympy_solver_visitor.hpp b/src/visitors/sympy_solver_visitor.hpp index b5a5b13516..4033d86174 100644 --- a/src/visitors/sympy_solver_visitor.hpp +++ b/src/visitors/sympy_solver_visitor.hpp @@ -23,8 +23,7 @@ #include "visitors/ast_visitor.hpp" #include "visitors/visitor_utils.hpp" -namespace nmodl { -namespace visitor { +namespace nmodl::visitor { /** * @addtogroup visitor_classes @@ -187,5 +186,4 @@ class SympySolverVisitor: public AstVisitor { /** @} */ // end of visitor_classes -} // namespace visitor -} // namespace nmodl +} // namespace nmodl::visitor diff --git a/src/visitors/symtab_visitor_helper.hpp b/src/visitors/symtab_visitor_helper.hpp index cfe299d64e..5298889477 100644 --- a/src/visitors/symtab_visitor_helper.hpp +++ b/src/visitors/symtab_visitor_helper.hpp @@ -15,8 +15,7 @@ #include "visitors/symtab_visitor.hpp" -namespace nmodl { -namespace visitor { +namespace nmodl::visitor { using symtab::Symbol; using symtab::syminfo::NmodlType; @@ -261,5 +260,4 @@ void SymtabVisitor::visit_table_statement(ast::TableStatement& node) { update_symbol(node.get_depend_vars(), NmodlType::table_assigned_var, num_values); } -} // namespace visitor -} // namespace nmodl +} // namespace nmodl::visitor diff --git a/src/visitors/units_visitor.hpp b/src/visitors/units_visitor.hpp index 543b0655a0..a987ca1c47 100644 --- a/src/visitors/units_visitor.hpp +++ b/src/visitors/units_visitor.hpp @@ -20,8 +20,7 @@ #include "visitors/ast_visitor.hpp" #include "visitors/visitor_utils.hpp" -namespace nmodl { -namespace visitor { +namespace nmodl::visitor { /** * \addtogroup visitor_classes @@ -87,5 +86,4 @@ class UnitsVisitor: public AstVisitor { /** \} */ // end of visitor_classes -} // namespace visitor -} // namespace nmodl +} // namespace nmodl::visitor diff --git a/src/visitors/var_usage_visitor.hpp b/src/visitors/var_usage_visitor.hpp index 933f3b5f0f..0ceca7d5ca 100644 --- a/src/visitors/var_usage_visitor.hpp +++ b/src/visitors/var_usage_visitor.hpp @@ -17,8 +17,7 @@ #include "visitors/ast_visitor.hpp" -namespace nmodl { -namespace visitor { +namespace nmodl::visitor { /** * \addtogroup visitor_classes @@ -48,5 +47,4 @@ class VarUsageVisitor: protected ConstAstVisitor { /** \} */ // end of visitor_classes -} // namespace visitor -} // namespace nmodl +} // namespace nmodl::visitor diff --git a/src/visitors/verbatim_var_rename_visitor.hpp b/src/visitors/verbatim_var_rename_visitor.hpp index 81baddb3fd..0077c44542 100644 --- a/src/visitors/verbatim_var_rename_visitor.hpp +++ b/src/visitors/verbatim_var_rename_visitor.hpp @@ -18,8 +18,7 @@ #include "symtab/symbol_table.hpp" #include "visitors/ast_visitor.hpp" -namespace nmodl { -namespace visitor { +namespace nmodl::visitor { /** * @addtogroup visitor_classes @@ -72,5 +71,4 @@ class VerbatimVarRenameVisitor: public AstVisitor { /** @} */ // end of visitor_classes -} // namespace visitor -} // namespace nmodl +} // namespace nmodl::visitor diff --git a/src/visitors/verbatim_visitor.hpp b/src/visitors/verbatim_visitor.hpp index d17c06b5dd..180322366a 100644 --- a/src/visitors/verbatim_visitor.hpp +++ b/src/visitors/verbatim_visitor.hpp @@ -17,8 +17,7 @@ #include "ast/ast.hpp" #include "visitors/ast_visitor.hpp" -namespace nmodl { -namespace visitor { +namespace nmodl::visitor { /** * @addtogroup visitor_classes @@ -59,5 +58,4 @@ class VerbatimVisitor: public ConstAstVisitor { /** @} */ // end of visitor_classes -} // namespace visitor -} // namespace nmodl +} // namespace nmodl::visitor