Generate code for options with modes. (#3561)

This commit adds support for code generation of options with modes (enums). From now on option enums can be specified in the corresponding *.toml files without the need of extra code. All option enums are now in the options namespace.

1 files changed, 12 insertions, 15 deletions

diff --git a/src/options/printer_modes.h b/src/options/printer_modes.h
index 79c57828b..10f8a4eac 100644
--- a/src/options/printer_modes.h
+++ b/src/options/printer_modes.h
@@ -23,26 +23,23 @@
 #include <iostream>
 
 namespace CVC4 {
+namespace options {
 
-/** Enumeration of model_format modes (how to print models from get-model command). */
-enum CVC4_PUBLIC ModelFormatMode {
+/** Enumeration of inst_format modes (how to print models from get-model
+ * command). */
+enum class CVC4_PUBLIC InstFormatMode
+{
   /** default mode (print expressions in the output language format) */
-  MODEL_FORMAT_MODE_DEFAULT,
-  /** print functional values in a table format */
-  MODEL_FORMAT_MODE_TABLE,
-};
-
-/** Enumeration of inst_format modes (how to print models from get-model command). */
-enum CVC4_PUBLIC InstFormatMode {
-  /** default mode (print expressions in the output language format) */
-  INST_FORMAT_MODE_DEFAULT,
+  DEFAULT,
   /** print as SZS proof */
-  INST_FORMAT_MODE_SZS,
+  SZS,
 };
 
-std::ostream& operator<<(std::ostream& out, ModelFormatMode mode) CVC4_PUBLIC;
-std::ostream& operator<<(std::ostream& out, InstFormatMode mode) CVC4_PUBLIC;
+}  // namespace options
+
+std::ostream& operator<<(std::ostream& out,
+                         options::InstFormatMode mode) CVC4_PUBLIC;
 
-}/* CVC4 namespace */
+}  // namespace CVC4
 
 #endif /* CVC4__PRINTER__MODEL_FORMAT_H */