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

CMakeLists.txt

@@ -2,7 +2,7 @@
 cmake_minimum_required(VERSION 3.4)
 
 set(CMAKE_USER_MAKE_RULES_OVERRIDE_CXX "${CMAKE_CURRENT_SOURCE_DIR}/cmake/cxx_compiler_flags_overrides.cmake")
-project(Z3 VERSION 4.9.2.0 LANGUAGES CXX)
+project(Z3 VERSION 4.10.0.0 LANGUAGES CXX)
 
 ################################################################################
 # Project version

scripts/mk_project.py

@@ -8,7 +8,7 @@
 from mk_util import *
 
 def init_version():
-    set_version(4, 9, 2, 0)
+    set_version(4, 10, 0, 0)
 
 # Z3 Project definition
 def init_project_def():

scripts/nightly.yaml

@@ -1,8 +1,8 @@
 variables:
 
   Major: '4'
-  Minor: '9'
-  Patch: '2'
+  Minor: '10'
+  Patch: '0'
   NightlyVersion: $(Major).$(Minor).$(Patch).$(Build.BuildId)-$(Build.DefinitionName)
 
 stages:

scripts/release.yml

@@ -6,7 +6,7 @@
 trigger: none
 
 variables:
-  ReleaseVersion: '4.9.2'
+  ReleaseVersion: '4.10.0'
 
 stages:
 

src/api/js/src/high-level/high-level.ts

@@ -1050,6 +1050,10 @@ export function createApi(Z3: Z3Core): Z3HighLevel {
         return check(Z3.model_to_string(contextPtr, this.ptr));
       }
 
+      toString() {
+        return this.sexpr();
+      }
+
       eval(expr: Bool<Name>, modelCompletion?: boolean): Bool<Name>;
       eval(expr: Arith<Name>, modelCompletion?: boolean): Arith<Name>;
       eval(expr: Expr<Name>, modelCompletion: boolean = false) {

src/api/python/z3/z3.py

@@ -204,12 +204,13 @@ def __init__(self, *args, **kws):
                 Z3_set_param_value(conf, str(prev), _to_param_value(a))
                 prev = None
         self.ctx = Z3_mk_context_rc(conf)
+        self.owner = True
         self.eh = Z3_set_error_handler(self.ctx, z3_error_handler)
         Z3_set_ast_print_mode(self.ctx, Z3_PRINT_SMTLIB2_COMPLIANT)
         Z3_del_config(conf)
 
     def __del__(self):
-        if Z3_del_context is not None:
+        if Z3_del_context is not None and self.owner:
             Z3_del_context(self.ctx)
         self.ctx = None
         self.eh = None
@@ -11367,12 +11368,14 @@ def user_prop_fresh(ctx, new_ctx):
     _prop_closures.set_threaded()
     prop = _prop_closures.get(ctx)
     nctx = Context()
+    Z3_del_context(nctx.ctx)
     new_ctx = to_ContextObj(new_ctx)
     nctx.ctx = new_ctx
     nctx.eh = Z3_set_error_handler(new_ctx, z3_error_handler)
+    nctx.owner = False
     new_prop = prop.fresh(nctx)
     _prop_closures.set(new_prop.id, new_prop)
-    return ctypes.c_void_p(new_prop.id)
+    return new_prop.id
 
 def to_Ast(ptr,):
     ast = Ast(ptr)