Adding listeners to Options.

- Options
-- Added the new option attribute :notify. One can get a notify() call on the Listener after a the option's value is updated. This is the new preferred way to achieve dynamic dispatch for options.
-- Removed SmtOptionsHandler and pushed its functionality into OptionsHandler and Listeners.
-- Added functions to Options for registering listeners of the notify calls.
-- Changed a number of options to use the new listener infrastructure.
-- Fixed a number of warnings in options.
-- Added the ArgumentExtender class to better capture how arguments are inserted while parsing options and ease memory management. Previously this was the "preemptGetopt" procedure.
-- Moved options/options_handler_interface.{cpp,h} to options/options_handler.{cpp,h}.

- Theories
-- Reimplemented alternative theories to use a datastructure stored on TheoryEngine instead of on Options.

- Ostream Handling:
-- Added new functionality that generalized how ostreams are opened, options/open_stream.h.
-- Simplified the memory management for different ostreams, smt/managed_ostreams.h.
-- Had the SmtEnginePrivate manage the memory for the ostreams set by options.
-- Simplified how the setting of ostreams are updated, smt/update_ostream.h.

- Configuration and Tags:
-- Configuration can now be used during predicates and handlers for options.
-- Moved configuration.{cpp,h,i} and configuration_private.h from util/ into base/.
-- Moved {Debug,Trace}_tags.* from being generated in options/ into base/.

- cvc4_private.h
-- Upgraded #warning's in cvc4_private.h and cvc4_private_library.h to #error's.
-- Added public first-order (non-templatized) member functions for options get and set the value of options outside of libcvc4. Fixed all of the use locations.
-- Made lib/lib/clock_gettime.h a cvc4_private_library.h header.

- Antlr
-- Fixed antlr and cvc4 macro definition conflicts that caused warnings.

- SmtGlobals
-- Refactored replayStream and replayLog out of SmtGlobals.
-- Renamed SmtGlobals to LemmaChannels and moved the implementation into smt_util/lemma_channels.{h,cpp}.

3 files changed, 8 insertions, 14 deletions

diff --git a/test/unit/expr/attribute_black.h b/test/unit/expr/attribute_black.h
index d162171d6..bea04a139 100644
--- a/test/unit/expr/attribute_black.h
+++ b/test/unit/expr/attribute_black.h
@@ -145,9 +145,10 @@ public:
   }
 
   class Foo {
-    int blah CVC4_UNUSED;
+    int d_bar;
   public:
-    Foo(int b) : blah(b) {}
+    Foo(int b) : d_bar(b) {}
+    int getBar() const { return d_bar; }
   };
 
   struct PtrAttributeId {};
@@ -175,6 +176,8 @@ public:
     TS_ASSERT(!node->getAttribute(cdattr, data2));
     node->setAttribute(cdattr, val);
     TS_ASSERT(node->getAttribute(cdattr, data3));
+    TS_ASSERT(data3 != NULL);
+    TS_ASSERT_EQUALS(63489, data3->getBar());
     TS_ASSERT_EQUALS(data3, val);
     delete node;
     delete val;
diff --git a/test/unit/expr/expr_public.h b/test/unit/expr/expr_public.h
index a83e53780..194aec0b1 100644
--- a/test/unit/expr/expr_public.h
+++ b/test/unit/expr/expr_public.h
@@ -22,7 +22,7 @@
 #include "base/exception.h"
 #include "expr/expr_manager.h"
 #include "expr/expr.h"
-#include "smt/smt_options_handler.h"
+#include "options/options.h"
 
 using namespace CVC4;
 using namespace CVC4::kind;
@@ -32,7 +32,6 @@ class ExprPublic : public CxxTest::TestSuite {
 private:
 
   Options opts;
-  smt::SmtOptionsHandler* d_handler;
 
   ExprManager* d_em;
 
@@ -55,12 +54,11 @@ public:
 
   void setUp() {
     try {
-      d_handler = new smt::SmtOptionsHandler(NULL);
 
       char *argv[2];
       argv[0] = strdup("");
       argv[1] = strdup("--output-language=ast");
-      opts.parseOptions(2, argv, d_handler);
+      opts.parseOptions(2, argv);
       free(argv[0]);
       free(argv[1]);
 
@@ -102,7 +100,6 @@ public:
       delete c_bool_and;
       delete b_bool;
       delete a_bool;
-      delete d_handler;
 
       delete d_em;
     } catch(Exception e) {
diff --git a/test/unit/expr/node_black.h b/test/unit/expr/node_black.h
index 3a24057b2..7d6ee523a 100644
--- a/test/unit/expr/node_black.h
+++ b/test/unit/expr/node_black.h
@@ -25,7 +25,6 @@
 #include "expr/node_builder.h"
 #include "expr/node_manager.h"
 #include "expr/node.h"
-#include "smt/smt_options_handler.h"
 
 using namespace CVC4;
 using namespace CVC4::kind;
@@ -35,7 +34,6 @@ class NodeBlack : public CxxTest::TestSuite {
 private:
 
   Options opts;
-  smt::SmtOptionsHandler* d_handler;
   NodeManager* d_nodeManager;
   NodeManagerScope* d_scope;
   TypeNode* d_booleanType;
@@ -44,13 +42,10 @@ private:
 public:
 
   void setUp() {
-#warning "TODO: Discuss the effects of this change with Clark."
-    d_handler = new smt::SmtOptionsHandler(NULL);
-
     char *argv[2];
     argv[0] = strdup("");
     argv[1] = strdup("--output-language=ast");
-    opts.parseOptions(2, argv, d_handler);
+    opts.parseOptions(2, argv);
     free(argv[0]);
     free(argv[1]);
 
@@ -64,7 +59,6 @@ public:
     delete d_booleanType;
     delete d_scope;
     delete d_nodeManager;
-    delete d_handler;
   }
 
   bool imp(bool a, bool b) const {