merged changes from unstable

Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>

src/api/api_datalog.cpp

@@ -449,6 +449,23 @@ extern "C" {
         RETURN_Z3(of_ast_vector(v));
         Z3_CATCH_RETURN(0);
     }
+
+    Z3_ast_vector Z3_API Z3_fixedpoint_get_assertions(
+        Z3_context c,
+        Z3_fixedpoint d)
+    {
+        Z3_TRY;
+        LOG_Z3_fixedpoint_get_assertions(c, d);
+        ast_manager& m = mk_c(c)->m();
+        Z3_ast_vector_ref* v = alloc(Z3_ast_vector_ref, m);
+        mk_c(c)->save_object(v);
+        unsigned num_asserts = to_fixedpoint_ref(d)->ctx().get_num_assertions();
+        for (unsigned i = 0; i < num_asserts; ++i) {
+            v->m_ast_vector.push_back(to_fixedpoint_ref(d)->ctx().get_assertion(i));
+        }
+        RETURN_Z3(of_ast_vector(v));
+        Z3_CATCH_RETURN(0);
+    }
     
     void Z3_API Z3_fixedpoint_set_reduce_assign_callback(
         Z3_context c, Z3_fixedpoint d, Z3_fixedpoint_reduce_assign_callback_fptr f) {

src/api/dotnet/Fixedpoint.cs

@@ -278,6 +278,23 @@ namespace Microsoft.Z3
             }
         }
 
+        /// <summary>
+        /// Retrieve set of assertions added to fixedpoint context.
+        /// </summary>                
+        public BoolExpr[] Assertions {
+            get
+            {
+                Contract.Ensures(Contract.Result<BoolExpr[]>() != null);
+
+                ASTVector v = new ASTVector(Context, Native.Z3_fixedpoint_get_assertions(Context.nCtx, NativeObject));
+                uint n = v.Size;
+                BoolExpr[] res = new BoolExpr[n];
+                for (uint i = 0; i < n; i++)
+                    res[i] = new BoolExpr(Context, v[i].NativeObject);
+                return res;
+            }
+        }
+
 
         #region Internal
         internal Fixedpoint(Context ctx, IntPtr obj)

src/api/python/z3.py

@@ -6145,7 +6145,11 @@ class Fixedpoint(Z3PPObject):
     def get_rules(self):
 	"""retrieve rules that have been added to fixedpoint context"""
 	return AstVector(Z3_fixedpoint_get_rules(self.ctx.ref(), self.fixedpoint), self.ctx)
-    
+
+    def get_assertions(self):
+	"""retrieve assertions that have been added to fixedpoint context"""
+	return AstVector(Z3_fixedpoint_get_assertions(self.ctx.ref(), self.fixedpoint), self.ctx)
+
     def __repr__(self):
         """Return a formatted string with all added rules and constraints."""
 	return self.sexpr()

src/api/z3_api.h

@@ -5535,7 +5535,7 @@ END_MLAPI_EXCLUDE
        of sorts in the domain of \c r. Each sort in the domain should be an integral
       (bit-vector, Boolean or or finite domain sort).
 
-       The call has the same effect as adding a rule where \r is applied to the arguments.
+       The call has the same effect as adding a rule where \c r is applied to the arguments.
 
        def_API('Z3_fixedpoint_add_fact', VOID, (_in(CONTEXT), _in(FIXEDPOINT), _in(FUNC_DECL), _in(UINT), _in_array(3, UINT)))
     */
@@ -5696,6 +5696,15 @@ END_MLAPI_EXCLUDE
         __in Z3_context c,
         __in Z3_fixedpoint f);
 
+    /**
+       \brief Retrieve set of background assertions from fixedpoint context.
+
+       def_API('Z3_fixedpoint_get_assertions', AST_VECTOR, (_in(CONTEXT),_in(FIXEDPOINT)))
+     */
+    Z3_ast_vector Z3_API Z3_fixedpoint_get_assertions(
+        __in Z3_context c,
+        __in Z3_fixedpoint f);
+
     /**
        \brief Set parameters on fixedpoint context.