Simplify generation of option module code. (#6995)

This commit simplifies both the code that generates the option modules and the generated code itself. It removes placeholders in the templates that are no longer used, gets rid of the option holder types (and replaces them by simple inline functions) and does some clean up on the related code in the `mkoptions.py` script.

1 files changed, 3 insertions, 21 deletions

diff --git a/src/options/module_template.h b/src/options/module_template.h
index a0719ea32..3a8e2a981 100644
--- a/src/options/module_template.h
+++ b/src/options/module_template.h
@@ -27,8 +27,7 @@ ${visibility_include}$
 ${includes}$
 // clang-format on
 
-namespace cvc5 {
-namespace options {
+namespace cvc5::options {
 
 // clang-format off
 ${modes_decl}$
@@ -50,35 +49,18 @@ ${holder_spec}$
 #undef DO_SEMANTIC_CHECKS_BY_DEFAULT
 
 // clang-format off
-${decls}$
+${wrap_funs}$
 // clang-format on
 
 namespace ${id}$
 {
 // clang-format off
 ${option_names}$
-// clang-format on
-}
-
-}  // namespace options
-
-// clang-format off
-${specs}$
-// clang-format on
 
-namespace options {
-// clang-format off
-${inls}$
-// clang-format on
-
-namespace ${id}$
-{
-// clang-format off
 ${defaults_decl}$
 // clang-format on
 }
 
-}  // namespace options
-}  // namespace cvc5
+}  // namespace cvc5::options
 
 #endif /* CVC5__OPTIONS__${id_cap}$_H */