Separating the steps of the old mkoptions script into smaller phases.

3 files changed, 75 insertions, 37 deletions

diff --git a/src/expr/Makefile.am b/src/expr/Makefile.am
index c5a032abc..1dbb24e09 100644
--- a/src/expr/Makefile.am
+++ b/src/expr/Makefile.am
@@ -37,7 +37,9 @@ libexpr_la_SOURCES = \
 	pickler.cpp \
 	node_self_iterator.h \
 	expr_stream.h \
-	kind_map.h
+	kind_map.h \
+	options_handlers.h \
+	options_handlers.cpp
 
 nodist_libexpr_la_SOURCES = \
 	kind.h \
diff --git a/src/expr/options_handlers.cpp b/src/expr/options_handlers.cpp
new file mode 100644
index 000000000..05fb8c203
--- /dev/null
+++ b/src/expr/options_handlers.cpp
@@ -0,0 +1,66 @@
+/*********************                                                        */
+/*! \file options_handlers.cpp
+ ** \verbatim
+ ** Original author: Morgan Deters
+ ** Major contributors: none
+ ** Minor contributors (to current version): none
+ ** This file is part of the CVC4 project.
+ ** Copyright (c) 2009-2014  New York University and The University of Iowa
+ ** See the file COPYING in the top-level source directory for licensing
+ ** information.\endverbatim
+ **
+ ** \brief Custom handlers and predicates for expression package options
+ **
+ ** Custom handlers and predicates for expression package options.
+ **/
+
+#include "cvc4_private.h"
+
+#include "expr/options_handlers.h"
+#include "util/dump.h"
+#include "util/output.h"
+
+namespace CVC4 {
+namespace expr {
+
+void setDefaultExprDepth(std::string option, int depth, SmtEngine* smt) {
+  if(depth < -1) {
+    throw OptionException("--default-expr-depth requires a positive argument, or -1.");
+  }
+
+  Debug.getStream() << Expr::setdepth(depth);
+  Trace.getStream() << Expr::setdepth(depth);
+  Notice.getStream() << Expr::setdepth(depth);
+  Chat.getStream() << Expr::setdepth(depth);
+  Message.getStream() << Expr::setdepth(depth);
+  Warning.getStream() << Expr::setdepth(depth);
+  // intentionally exclude Dump stream from this list
+}
+
+void setDefaultDagThresh(std::string option, int dag, SmtEngine* smt) {
+  if(dag < 0) {
+    throw OptionException("--default-dag-thresh requires a nonnegative argument.");
+  }
+
+  Debug.getStream() << Expr::dag(dag);
+  Trace.getStream() << Expr::dag(dag);
+  Notice.getStream() << Expr::dag(dag);
+  Chat.getStream() << Expr::dag(dag);
+  Message.getStream() << Expr::dag(dag);
+  Warning.getStream() << Expr::dag(dag);
+  Dump.getStream() << Expr::dag(dag);
+}
+
+void setPrintExprTypes(std::string option, SmtEngine* smt) {
+  Debug.getStream() << Expr::printtypes(true);
+  Trace.getStream() << Expr::printtypes(true);
+  Notice.getStream() << Expr::printtypes(true);
+  Chat.getStream() << Expr::printtypes(true);
+  Message.getStream() << Expr::printtypes(true);
+  Warning.getStream() << Expr::printtypes(true);
+  // intentionally exclude Dump stream from this list
+}
+
+}/* CVC4::expr namespace */
+}/* CVC4 namespace */
+
diff --git a/src/expr/options_handlers.h b/src/expr/options_handlers.h
index e2a92ade7..32735efa3 100644
--- a/src/expr/options_handlers.h
+++ b/src/expr/options_handlers.h
@@ -19,49 +19,19 @@
 #ifndef __CVC4__EXPR__OPTIONS_HANDLERS_H
 #define __CVC4__EXPR__OPTIONS_HANDLERS_H
 
-#include "util/output.h"
-#include "util/dump.h"
+#include <string>
 
 namespace CVC4 {
-namespace expr {
+class SmtEngine;
 
-inline void setDefaultExprDepth(std::string option, int depth, SmtEngine* smt) {
-  if(depth < -1) {
-    throw OptionException("--default-expr-depth requires a positive argument, or -1.");
-  }
+namespace expr {
 
-  Debug.getStream() << Expr::setdepth(depth);
-  Trace.getStream() << Expr::setdepth(depth);
-  Notice.getStream() << Expr::setdepth(depth);
-  Chat.getStream() << Expr::setdepth(depth);
-  Message.getStream() << Expr::setdepth(depth);
-  Warning.getStream() << Expr::setdepth(depth);
-  // intentionally exclude Dump stream from this list
-}
 
-inline void setDefaultDagThresh(std::string option, int dag, SmtEngine* smt) {
-  if(dag < 0) {
-    throw OptionException("--default-dag-thresh requires a nonnegative argument.");
-  }
+void setDefaultExprDepth(std::string option, int depth, SmtEngine* smt);
 
-  Debug.getStream() << Expr::dag(dag);
-  Trace.getStream() << Expr::dag(dag);
-  Notice.getStream() << Expr::dag(dag);
-  Chat.getStream() << Expr::dag(dag);
-  Message.getStream() << Expr::dag(dag);
-  Warning.getStream() << Expr::dag(dag);
-  Dump.getStream() << Expr::dag(dag);
-}
+void setDefaultDagThresh(std::string option, int dag, SmtEngine* smt);
 
-inline void setPrintExprTypes(std::string option, SmtEngine* smt) {
-  Debug.getStream() << Expr::printtypes(true);
-  Trace.getStream() << Expr::printtypes(true);
-  Notice.getStream() << Expr::printtypes(true);
-  Chat.getStream() << Expr::printtypes(true);
-  Message.getStream() << Expr::printtypes(true);
-  Warning.getStream() << Expr::printtypes(true);
-  // intentionally exclude Dump stream from this list
-}
+void setPrintExprTypes(std::string option, SmtEngine* smt);
 
 }/* CVC4::expr namespace */
 }/* CVC4 namespace */