Merge branch 'unstable' of https://git01.codeplex.com/z3 into unstable

src/muz_qe/dl_context.cpp

@@ -1697,8 +1697,9 @@ namespace datalog {
                 while (fresh_names.contains(nm)) {
                     std::ostringstream s;
                     s << nm << "!";
-                    nm = symbol(s.str().c_str());
+                    nm = symbol(s.str().c_str());                    
                 }
+                fresh_names.add(nm);
                 out << " :named " << nm << ")";
             }
             out << ")\n";

src/muz_qe/model2expr.h

@@ -35,6 +35,7 @@ class mk_fresh_name {
 public:
     mk_fresh_name(): m_char('A'), m_num(0) {}
     void add(ast* a);
+    void add(symbol const& s) { m_symbols.insert(s); }
     symbol next();
     bool contains(symbol const& s) const { return m_symbols.contains(s); }
 };