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, 19 insertions, 19 deletions

diff --git a/test/unit/util/configuration_black.h b/test/unit/util/configuration_black.h
index 2d7378a67..f07763595 100644
--- a/test/unit/util/configuration_black.h
+++ b/test/unit/util/configuration_black.h
@@ -16,7 +16,7 @@
 
 #include <cxxtest/TestSuite.h>
 
-#include "util/configuration.h"
+#include "base/configuration.h"
 
 using namespace CVC4;
 using namespace std;
diff --git a/test/unit/util/listener_black.h b/test/unit/util/listener_black.h
index cd3a08d4e..682a7c67b 100644
--- a/test/unit/util/listener_black.h
+++ b/test/unit/util/listener_black.h
@@ -64,7 +64,7 @@ public:
     ListenerCollection collection;
     std::string expected[1] = {"a"};
     {
-      RegisterListener a(&collection, new EventListener(d_events, "a"));
+      ListenerCollection::Registration a(&collection, new EventListener(d_events, "a"));
       collection.notify();
       TS_ASSERT(not collection.empty());
     }
@@ -77,7 +77,7 @@ public:
     // registering a single event.
     ListenerCollection* collection = new ListenerCollection;
     {
-      RegisterListener a(collection, new EventListener(d_events, "a"));
+      ListenerCollection::Registration a(collection, new EventListener(d_events, "a"));
       TS_ASSERT(not collection->empty());
       // The destructor for a now runs.
     }
@@ -88,11 +88,11 @@ public:
   void testMultipleCollection() {
     ListenerCollection* collection = new ListenerCollection;
     {
-      RegisterListener c(collection, new EventListener(d_events, "c"));
+      ListenerCollection::Registration c(collection, new EventListener(d_events, "c"));
       collection->notify();
       // d_events == {"c"}
-      RegisterListener b(collection, new EventListener(d_events, "b"));
-      RegisterListener a(collection, new EventListener(d_events, "a"));
+      ListenerCollection::Registration b(collection, new EventListener(d_events, "b"));
+      ListenerCollection::Registration a(collection, new EventListener(d_events, "a"));
       collection->notify();
       // d_events == {"a", "b", "c", "c"}
       TS_ASSERT(not collection->empty());
@@ -107,10 +107,10 @@ public:
     // registering several events.
     ListenerCollection* collection = new ListenerCollection;
     {
-      RegisterListener a(collection, new EventListener(d_events, "a"));
-      RegisterListener* b =
-          new RegisterListener(collection, new EventListener(d_events, "b"));
-      RegisterListener c(collection, new EventListener(d_events, "c"));
+      ListenerCollection::Registration a(collection, new EventListener(d_events, "a"));
+      ListenerCollection::Registration* b =
+          new ListenerCollection::Registration(collection, new EventListener(d_events, "b"));
+      ListenerCollection::Registration c(collection, new EventListener(d_events, "c"));
 
       collection->notify();
       delete b;
@@ -128,17 +128,17 @@ public:
     // This tests adds and notify multiple times.
     ListenerCollection collection;
 
-    std::vector<RegisterListener*> listeners;
+    std::vector<ListenerCollection::Registration*> listeners;
     for(int i = 0; i < 4 ; ++i){
       stringstream ss; ss << i;
       Listener* listener = new EventListener(d_events, ss.str());
-      listeners.push_back(new RegisterListener(&collection, listener));
+      listeners.push_back(new ListenerCollection::Registration(&collection, listener));
       collection.notify();
     }
 
     TS_ASSERT(not collection.empty());
     for(int i=0; i < listeners.size(); ++i){
-      RegisterListener* at_i = listeners[i];
+      ListenerCollection::Registration* at_i = listeners[i];
       delete at_i;
     }
     listeners.clear();
diff --git a/test/unit/util/output_black.h b/test/unit/util/output_black.h
index 87423f026..369f5b673 100644
--- a/test/unit/util/output_black.h
+++ b/test/unit/util/output_black.h
@@ -36,12 +36,12 @@ class OutputBlack : public CxxTest::TestSuite {
 public:
 
   void setUp() {
-    DebugChannel.setStream(d_debugStream);
-    TraceChannel.setStream(d_traceStream);
-    NoticeChannel.setStream(d_noticeStream);
-    ChatChannel.setStream(d_chatStream);
-    MessageChannel.setStream(d_messageStream);
-    WarningChannel.setStream(d_warningStream);
+    DebugChannel.setStream(&d_debugStream);
+    TraceChannel.setStream(&d_traceStream);
+    NoticeChannel.setStream(&d_noticeStream);
+    ChatChannel.setStream(&d_chatStream);
+    MessageChannel.setStream(&d_messageStream);
+    WarningChannel.setStream(&d_warningStream);
 
     d_debugStream.str("");
     d_traceStream.str("");