1 files changed, 36 insertions, 6 deletions
diff --git a/src/expr/options_handlers.h b/src/expr/options_handlers.h
index 32735efa3..e2a92ade7 100644
--- a/src/expr/options_handlers.h
+++ b/src/expr/options_handlers.h
@@ -19,19 +19,49 @@
 #ifndef __CVC4__EXPR__OPTIONS_HANDLERS_H
 #define __CVC4__EXPR__OPTIONS_HANDLERS_H
 
-#include <string>
+#include "util/output.h"
+#include "util/dump.h"
 
 namespace CVC4 {
-class SmtEngine;
-
 namespace expr {
 
+inline 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 setDefaultExprDepth(std::string option, int depth, SmtEngine* smt);
+inline void setDefaultDagThresh(std::string option, int dag, SmtEngine* smt) {
+  if(dag < 0) {
+    throw OptionException("--default-dag-thresh requires a nonnegative argument.");
+  }
 
-void setDefaultDagThresh(std::string option, int dag, 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 setPrintExprTypes(std::string option, 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
+}
 
 }/* CVC4::expr namespace */
 }/* CVC4 namespace */