Merge branch 'master' of https://github.com/Z3Prover/z3

src/api/dotnet/core/DummyContracts.cs

@@ -0,0 +1,59 @@
+/*++
+Copyright (<c>) 2016 Microsoft Corporation
+
+Module Name:
+
+    Contracts.cs
+
+Abstract:
+
+    Z3 Managed API: Dummy Code Contracts class for .NET
+    frameworks that don't support them (e.g., CoreCLR).
+
+Author:
+
+    Christoph Wintersteiger (cwinter) 2016-10-06
+
+Notes:
+
+--*/
+
+namespace System.Diagnostics.Contracts
+{
+    public class ContractClass : Attribute
+    {
+        public ContractClass(Type t) { }
+    }
+
+    public class ContractClassFor : Attribute
+    {
+        public ContractClassFor(Type t) { }
+    }
+
+    public class ContractInvariantMethod : Attribute
+    {
+        public ContractInvariantMethod() { }
+    }
+
+    public class ContractVerification : Attribute
+    {
+        public ContractVerification(bool b) { }
+    }
+
+    public class Pure : Attribute { }
+
+    public static class Contract
+    {
+        public static void Ensures(bool b) { }
+        public static void Requires(bool b) { }
+        public static void Assume(bool b, string msg) { }
+        public static void Assert(bool b) { }
+        public static bool ForAll(bool b) { return true; }
+        public static bool ForAll(Object c, Func<Object, bool> p) { return true; }
+        public static bool ForAll(int from, int to, Predicate<int> p) { return true; }
+        public static void Invariant(bool b) { }
+        public static T[] Result<T>() { return new T[1]; }
+        public static void EndContractBlock() { }
+        public static T ValueAtReturn<T>(out T v) { T[] t = new T[1]; v = t[0]; return v; }
+    }
+}

src/api/dotnet/core/project.json

@@ -0,0 +1,21 @@
+{
+    "version": "1.0.0-*",
+    "buildOptions": {
+        "debugType": "portable",
+        "emitEntryPoint": false,
+        "outputName": "Microsoft.Z3",
+        "compile": [ "../*.cs", "*.cs" ]
+    },
+    "dependencies": { },
+    "frameworks": {
+        "netcoreapp1.0": {
+            "dependencies": {
+                "Microsoft.NETCore.App": {
+                    "type": "platform",
+                    "version": "1.0.1"
+                }
+            },
+            "imports": "dnxcore50"
+        }
+    }
+}

src/api/python/z3/z3num.py

@@ -10,6 +10,8 @@ from .z3core import *
 from .z3printer import *
 from fractions import Fraction
 
+from .z3 import _get_ctx
+
 def _to_numeral(num, ctx=None):
     if isinstance(num, Numeral):
         return num
@@ -86,7 +88,7 @@ class Numeral:
     def __init__(self, num, ctx=None):
         if isinstance(num, Ast):
             self.ast  = num
-            self.ctx  = z3._get_ctx(ctx)
+            self.ctx  = _get_ctx(ctx)
         elif isinstance(num, RatNumRef) or isinstance(num, AlgebraicNumRef):
             self.ast = num.ast
             self.ctx = num.ctx

src/api/z3_api.h

@@ -1997,9 +1997,9 @@ extern "C" {
        \param c logical context.
        \param constr constructor container. The container must have been passed in to a #Z3_mk_datatype call.
        \param num_fields number of accessor fields in the constructor.
-       \param constructor constructor function declaration.
-       \param tester constructor test function declaration.
-       \param accessors array of accessor function declarations.
+       \param constructor constructor function declaration, allocated by user.
+       \param tester constructor test function declaration, allocated by user.
+       \param accessors array of accessor function declarations allocated by user. The array must contain num_fields elements.
 
        def_API('Z3_query_constructor', VOID, (_in(CONTEXT), _in(CONSTRUCTOR), _in(UINT), _out(FUNC_DECL), _out(FUNC_DECL), _out_array(2, FUNC_DECL)))
     */