From f1d62dca90fbe606501591b68ec599ab4d746ace Mon Sep 17 00:00:00 2001
From: Cristian Cadar <c.cadar@imperial.ac.uk>
Date: Mon, 11 Mar 2019 14:10:44 +0000
Subject: Moved options in ExprSMTLIBPrinter.cpp to the expression building and
 printing category

---
 lib/Expr/ExprSMTLIBPrinter.cpp | 48 +++++++++++++++++++++++-------------------
 1 file changed, 26 insertions(+), 22 deletions(-)

diff --git a/lib/Expr/ExprSMTLIBPrinter.cpp b/lib/Expr/ExprSMTLIBPrinter.cpp
index 8e0810ad..06186db2 100644
--- a/lib/Expr/ExprSMTLIBPrinter.cpp
+++ b/lib/Expr/ExprSMTLIBPrinter.cpp
@@ -6,34 +6,37 @@
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
+
+#include "klee/util/ExprSMTLIBPrinter.h"
+
 #include "llvm/Support/Casting.h"
 #include "llvm/Support/CommandLine.h"
 #include "llvm/Support/ErrorHandling.h"
-#include "klee/util/ExprSMTLIBPrinter.h"
 
 #include <stack>
 
 namespace ExprSMTLIBOptions {
 // Command line options
 llvm::cl::opt<klee::ExprSMTLIBPrinter::ConstantDisplayMode>
-argConstantDisplayMode(
-    "smtlib-display-constants",
-    llvm::cl::desc("Sets how bitvector constants are written in generated "
-                   "SMT-LIBv2 files (default=dec)"),
-    llvm::cl::values(clEnumValN(klee::ExprSMTLIBPrinter::BINARY, "bin",
-                                "Use binary form (e.g. #b00101101)"),
-                     clEnumValN(klee::ExprSMTLIBPrinter::HEX, "hex",
-                                "Use Hexadecimal form (e.g. #x2D)"),
-                     clEnumValN(klee::ExprSMTLIBPrinter::DECIMAL, "dec",
-                                "Use decimal form (e.g. (_ bv45 8) )")
-                     KLEE_LLVM_CL_VAL_END),
-    llvm::cl::init(klee::ExprSMTLIBPrinter::DECIMAL));
-
-llvm::cl::opt<bool> humanReadableSMTLIB(
-    "smtlib-human-readable",
-    llvm::cl::desc(
-        "Enables generated SMT-LIBv2 files to be human readable (default=false)"),
-    llvm::cl::init(false));
+    argConstantDisplayMode(
+        "smtlib-display-constants",
+        llvm::cl::desc("Sets how bitvector constants are written in generated "
+                       "SMT-LIBv2 files (default=dec)"),
+        llvm::cl::values(clEnumValN(klee::ExprSMTLIBPrinter::BINARY, "bin",
+                                    "Use binary form (e.g. #b00101101)"),
+                         clEnumValN(klee::ExprSMTLIBPrinter::HEX, "hex",
+                                    "Use Hexadecimal form (e.g. #x2D)"),
+                         clEnumValN(klee::ExprSMTLIBPrinter::DECIMAL, "dec",
+                                    "Use decimal form (e.g. (_ bv45 8) )")
+                             KLEE_LLVM_CL_VAL_END),
+        llvm::cl::init(klee::ExprSMTLIBPrinter::DECIMAL),
+        llvm::cl::cat(klee::ExprCat));
+
+llvm::cl::opt<bool>
+    humanReadableSMTLIB("smtlib-human-readable",
+                        llvm::cl::desc("Enables generated SMT-LIBv2 files to "
+                                       "be human readable (default=false)"),
+                        llvm::cl::init(false), llvm::cl::cat(klee::ExprCat));
 
 llvm::cl::opt<klee::ExprSMTLIBPrinter::AbbreviationMode> abbreviationMode(
     "smtlib-abbreviation-mode",
@@ -45,9 +48,10 @@ llvm::cl::opt<klee::ExprSMTLIBPrinter::AbbreviationMode> abbreviationMode(
                                 "Abbreviate with let"),
                      clEnumValN(klee::ExprSMTLIBPrinter::ABBR_NAMED, "named",
                                 "Abbreviate with :named annotations")
-                     KLEE_LLVM_CL_VAL_END),
-    llvm::cl::init(klee::ExprSMTLIBPrinter::ABBR_LET));
-}
+                         KLEE_LLVM_CL_VAL_END),
+    llvm::cl::init(klee::ExprSMTLIBPrinter::ABBR_LET),
+    llvm::cl::cat(klee::ExprCat));
+} // namespace ExprSMTLIBOptions
 
 namespace klee {
 
-- 
cgit 1.4.1