Merge from ufprop branch, including:

* Theory::staticLearning() for statically adding new T-stuff before
  normal preprocessing.  UF's staticLearning() does transitivity of
  equality/iff, solving the diamonds.

* more aggressive T-propagation for UF

* new KEEP_STATISTIC macro to hide Theories from having to
  register/deregister statistics (and also has the advantage of
  keeping the statistic type, field name, and the 'tag' used to output
  the statistic in the same place---instead of scattered in the theory
  definition and constructor initializer list.  See documentation for
  KEEP_STATISTIC in src/util/stats.h for more of an explanation).

* more statistics for UF

* restart notifications from SAT (through TheoryEngine) via
  Theory::notifyRestart()

* StackingMap and UnionFind unit tests

* build fixes/adjustments

* code cleanup; minor other improvements

1 files changed, 5 insertions, 1 deletions

diff --git a/src/theory/builtin/theory_builtin.h b/src/theory/builtin/theory_builtin.h
index f373d16c2..cce5ac6b8 100644
--- a/src/theory/builtin/theory_builtin.h
+++ b/src/theory/builtin/theory_builtin.h
@@ -32,8 +32,12 @@ class TheoryBuiltin : public Theory {
   static Node blastDistinct(TNode in);
 
 public:
-  TheoryBuiltin(int id, context::Context* c, OutputChannel& out) : Theory(id, c, out) { }
+  TheoryBuiltin(int id, context::Context* c, OutputChannel& out) :
+    Theory(id, c, out) {
+  }
+
   ~TheoryBuiltin() { }
+
   void preRegisterTerm(TNode n) { Unreachable(); }
   void registerTerm(TNode n) { Unreachable(); }
   void check(Effort e) { Unreachable(); }