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

src/muz_qe/dl_bmc_engine.cpp

@@ -963,7 +963,7 @@ namespace datalog {
             
             
             sort_ref_vector new_sorts(m);
-            family_id dfid = m.get_family_id("datatype");
+            family_id dfid = m.mk_family_id("datatype");
             datatype_decl_plugin* dtp = static_cast<datatype_decl_plugin*>(m.get_plugin(dfid));
             VERIFY (dtp->mk_datatypes(dts.size(), dts.c_ptr(), new_sorts));
             

src/muz_qe/dl_cmds.cpp

@@ -75,7 +75,7 @@ struct dl_context {
         if (!m_decl_plugin) {
             symbol name("datalog_relation");
             if (m.has_plugin(name)) {
-                m_decl_plugin = static_cast<datalog::dl_decl_plugin*>(m_cmd.m().get_plugin(m.get_family_id(name)));
+                m_decl_plugin = static_cast<datalog::dl_decl_plugin*>(m_cmd.m().get_plugin(m.mk_family_id(name)));
             }
             else {
                 m_decl_plugin = alloc(datalog::dl_decl_plugin);

src/muz_qe/dl_context.h

@@ -349,6 +349,7 @@ namespace datalog {
         void cancel();
 
         void cleanup();
+        void reset_cancel() { cleanup(); }
 
         /**
            \brief check if query 'q' is satisfied under asserted rules and background.

src/muz_qe/dl_relation_manager.h

@@ -3,7 +3,7 @@ Copyright (c) 2006 Microsoft Corporation
 
 Module Name:
 
-    dl_remation_manager.h
+    dl_relation_manager.h
 
 Abstract:
 
@@ -316,7 +316,7 @@ namespace datalog {
                 oldTgt:=tgt.clone();
                 tgt:=tgt \union src
                 if(tgt!=oldTgt) {
-                    delta:=delta \union src    //also “delta \union tgt” would work
+                    delta:=delta \union src    //also ?delta \union tgt? would work
                 }
             }
 
@@ -488,7 +488,7 @@ namespace datalog {
                 oldTgt:=tgt.clone();
                 tgt:=tgt \union src
                 if(tgt!=oldTgt) {
-                    delta:=delta \union src    //also “delta \union tgt” would work
+                    delta:=delta \union src    //also ?delta \union tgt? would work
                 }
             }
 

src/muz_qe/dl_rule.cpp

@@ -74,7 +74,7 @@ namespace datalog {
     class remove_label_cfg : public default_rewriter_cfg {
         family_id m_label_fid;
     public:        
-        remove_label_cfg(ast_manager& m): m_label_fid(m.get_family_id("label")) {}
+        remove_label_cfg(ast_manager& m): m_label_fid(m.get_label_family_id()) {}
         virtual ~remove_label_cfg() {}
 
         br_status reduce_app(func_decl * f, unsigned num, expr * const * args, expr_ref & result, 

src/muz_qe/proof_utils.cpp

@@ -450,7 +450,7 @@ static void permute_unit_resolution(expr_ref_vector& refs, obj_map<proof,proof*>
         parameter const* params = thLemma->get_decl()->get_parameters();
         unsigned num_params = thLemma->get_decl()->get_num_parameters();
         SASSERT(params[0].is_symbol());
-        family_id tid = m.get_family_id(params[0].get_symbol());
+        family_id tid = m.mk_family_id(params[0].get_symbol());
         SASSERT(tid != null_family_id);
         prNew = m.mk_th_lemma(tid, m.get_fact(pr), 
                               premises.size(), premises.c_ptr(), num_params-1, params+1);

src/muz_qe/qe_arith_plugin.cpp

@@ -1512,7 +1512,7 @@ public:
 
     public:
         arith_plugin(i_solver_context& ctx, ast_manager& m, smt_params& p): 
-            qe_solver_plugin(m, m.get_family_id("arith"), ctx),
+            qe_solver_plugin(m, m.mk_family_id("arith"), ctx),
             m_util(m, p, ctx),
             m_trail(m)
         {}
@@ -2403,7 +2403,7 @@ public:
         bool                         m_produce_models;
     public:
         nlarith_plugin(i_solver_context& ctx, ast_manager& m, bool produce_models) : 
-            qe_solver_plugin(m, m.get_family_id("arith"), ctx),
+            qe_solver_plugin(m, m.mk_family_id("arith"), ctx),
             m_rewriter(m),
             m_util(m),
             m_replacer(mk_default_expr_replacer(m)),

src/muz_qe/qe_array_plugin.cpp

@@ -16,7 +16,7 @@ namespace qe {
     public:
 
         array_plugin(i_solver_context& ctx, ast_manager& m) : 
-            qe_solver_plugin(m, m.get_family_id("array"), ctx),
+            qe_solver_plugin(m, m.mk_family_id("array"), ctx),
             m_replace(mk_default_expr_replacer(m))
         {
         }

src/muz_qe/qe_bv_plugin.cpp

@@ -32,7 +32,7 @@ namespace qe {
         bv_util      m_bv;
     public:
         bv_plugin(i_solver_context& ctx, ast_manager& m): 
-            qe_solver_plugin(m, m.get_family_id("bv"), ctx),
+            qe_solver_plugin(m, m.mk_family_id("bv"), ctx),
             m_replace(mk_default_expr_replacer(m)),
             m_bv(m)
         {}

src/muz_qe/qe_datatype_plugin.cpp

@@ -422,7 +422,7 @@ namespace qe {
 
     public:
         datatype_plugin(i_solver_context& ctx, ast_manager& m) : 
-            qe_solver_plugin(m, m.get_family_id("datatype"), ctx),
+            qe_solver_plugin(m, m.mk_family_id("datatype"), ctx),
             m_datatype_util(m),
             m_replace(mk_default_expr_replacer(m)),
             m_trail(m)

src/muz_qe/qe_dl_plugin.cpp

@@ -45,7 +45,7 @@ namespace qe {
         
     public:
         dl_plugin(i_solver_context& ctx, ast_manager& m) : 
-            qe_solver_plugin(m, m.get_family_id("datalog_relation"), ctx),
+            qe_solver_plugin(m, m.mk_family_id("datalog_relation"), ctx),
             m_replace(mk_default_expr_replacer(m)),
             m_util(m),
             m_trail(m)