fix build break - by renaming tout to out

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

scripts/mk_util.py

@@ -75,7 +75,7 @@ VER_MAJOR=None
 VER_MINOR=None
 VER_BUILD=None
 VER_REVISION=None
-PREFIX=os.path.split(os.path.split(os.path.split(PYTHON_PACKAGE_DIR)[0])[0])[0]
+PREFIX=sys.prefix
 GMP=False
 FOCI2=False
 FOCI2LIB=''
@@ -531,6 +531,7 @@ if os.name == 'nt':
 elif os.name == 'posix':
     if os.uname()[0] == 'Darwin':
         IS_OSX=True
+        PREFIX="/usr/local"
     elif os.uname()[0] == 'Linux':
         IS_LINUX=True
     elif os.uname()[0] == 'FreeBSD':
@@ -1984,6 +1985,7 @@ def mk_config():
             print('Prefix:         %s' % PREFIX)
             print('64-bit:         %s' % is64())
             print('FP math:        %s' % FPMATH)
+            print("Python pkg dir: %s" % PYTHON_PACKAGE_DIR)
             if GPROF:
                 print('gprof:          enabled')
             print('Python version: %s' % distutils.sysconfig.get_python_version())
@@ -2074,8 +2076,6 @@ def mk_makefile():
     # Finalize
     if VERBOSE:
         print("Makefile was successfully generated.")
-        if not IS_WINDOWS:
-            print("  python packages dir: %s" % PYTHON_PACKAGE_DIR)
         if DEBUG_MODE:
             print("  compilation mode: Debug")
         else:

src/api/java/Model.java

@@ -56,7 +56,7 @@ public class Model extends Z3Object
                         Native.getRange(getContext().nCtx(), f.getNativeObject())) == Z3_sort_kind.Z3_ARRAY_SORT
                         .toInt())
             throw new Z3Exception(
-                    "Non-zero arity functions and arrays have FunctionInterpretations as a model. Use FuncInterp.");
+                    "Non-zero arity functions and arrays have FunctionInterpretations as a model. Use getFuncInterp.");
 
         long n = Native.modelGetConstInterp(getContext().nCtx(), getNativeObject(),
                 f.getNativeObject());
@@ -101,7 +101,7 @@ public class Model extends Z3Object
             } else
             {
                 throw new Z3Exception(
-                        "Constant functions do not have a function interpretation; use ConstInterp");
+                        "Constant functions do not have a function interpretation; use getConstInterp");
             }
         } else
         {

src/api/python/z3.py

@@ -284,6 +284,9 @@ class AstRef(Z3PPObject):
     def __repr__(self):
         return obj_to_string(self)
 
+    def __hash__(self):
+        return self.hash()
+
     def sexpr(self):
         """Return an string representing the AST node in s-expression notation.
         

src/cmd_context/cmd_context.cpp

@@ -507,6 +507,8 @@ bool cmd_context::logic_has_arith_core(symbol const & s) const {
         s == "QF_AUFLIRA" ||
         s == "QF_AUFNIA" ||
         s == "QF_AUFNIRA" ||
+        s == "QF_ANIA" ||
+        s == "QF_LIRA" ||
         s == "QF_UFLIA" ||
         s == "QF_UFLRA" ||
         s == "QF_UFIDL" ||
@@ -518,6 +520,7 @@ bool cmd_context::logic_has_arith_core(symbol const & s) const {
         s == "QF_UFNIA" ||
         s == "QF_UFNIRA" ||
         s == "QF_BVRE" ||
+        s == "ALIA" ||
         s == "AUFLIA" ||
         s == "AUFLIRA" ||
         s == "AUFNIA" ||
@@ -526,9 +529,12 @@ bool cmd_context::logic_has_arith_core(symbol const & s) const {
         s == "UFLRA" ||
         s == "UFNRA" ||
         s == "UFNIRA" ||
+        s == "NIA" ||
+        s == "NRA" ||
         s == "UFNIA" ||
         s == "LIA" ||
         s == "LRA" ||
+        s == "UFIDL" ||
         s == "QF_FP" ||
         s == "QF_FPBV" ||
         s == "QF_BVFP" ||
@@ -583,10 +589,12 @@ bool cmd_context::logic_has_array_core(symbol const & s) const {
     return
         s == "QF_AX" ||
         s == "QF_AUFLIA" ||
+        s == "QF_ANIA" ||
         s == "QF_ALIA" ||
         s == "QF_AUFLIRA" ||
         s == "QF_AUFNIA" ||
         s == "QF_AUFNIRA" ||
+        s == "ALIA" ||
         s == "AUFLIA" ||
         s == "AUFLIRA" ||
         s == "AUFNIA" ||

src/tactic/smtlogics/qfaufbv_tactic.h

@@ -25,4 +25,8 @@ class tactic;
 
 tactic * mk_qfaufbv_tactic(ast_manager & m, params_ref const & p = params_ref());
 
+/*
+  ADD_TACTIC("qfaufbv",  "builtin strategy for solving QF_AUFBV problems.", "mk_qfaufbv_tactic(m, p)")
+*/
+
 #endif

src/tactic/smtlogics/qfauflia_tactic.h

@@ -25,4 +25,8 @@ class tactic;
 
 tactic * mk_qfauflia_tactic(ast_manager & m, params_ref const & p = params_ref());
 
+/*
+  ADD_TACTIC("qfauflia",  "builtin strategy for solving QF_AUFLIA problems.", "mk_qfauflia_tactic(m, p)")
+*/
+
 #endif

src/tactic/smtlogics/qfidl_tactic.h

@@ -25,4 +25,8 @@ class tactic;
 
 tactic * mk_qfidl_tactic(ast_manager & m, params_ref const & p = params_ref());
 
+/*
+    ADD_TACTIC("qfidl", "builtin strategy for solving QF_IDL problems.", "mk_qfidl_tactic(m, p)")
+*/
+
 #endif

src/tactic/smtlogics/qfuf_tactic.h

@@ -26,4 +26,8 @@ class tactic;
 
 tactic * mk_qfuf_tactic(ast_manager & m, params_ref const & p);
 
+/*
+  ADD_TACTIC("qfuf", "builtin strategy for solving QF_UF problems.", "mk_qfuf_tactic(m, p)")
+*/
+
 #endif

src/tactic/smtlogics/qfufbv_tactic.h

@@ -25,4 +25,8 @@ class tactic;
 
 tactic * mk_qfufbv_tactic(ast_manager & m, params_ref const & p = params_ref());
 
+/*
+  ADD_TACTIC("qfufbv", "builtin strategy for solving QF_UFBV problems.", "mk_qfufbv_tactic(m, p)")
+*/
+
 #endif