Register context as error handler

Author: samarion

src/main/java/z3/Z3Wrapper.java

@@ -30,6 +30,7 @@ public final class Z3Wrapper {
 
     private static final String LIB_NAME   = "scalaz3";
     private static final String LIBZ3_NAME = "libz3";
+    private static final String Z3JAVA_NAME = "z3java";
     private static final String LIBZ3JAVA_NAME = "libz3java";
 
     public static Object creation_lock = new Object();
@@ -91,9 +92,16 @@ private static void loadFromJar() {
           if (os != null && os.indexOf("Win") >= 0) {
             // Under windows, we first load libz3 explicitly, on which ScalaZ3 depends
             debug("Loading libz3");
-            System.loadLibrary(LIBZ3_NAME);
+            try { System.loadLibrary(LIBZ3_NAME); }
+            catch (UnsatisfiedLinkError e) { debug("Failed to load " + LIBZ3_NAME); }
+
+            debug("Loading z3java");
+            try { System.loadLibrary(Z3JAVA_NAME); }
+            catch (UnsatisfiedLinkError e) { debug("Failed to load " + Z3JAVA_NAME); }
+
             debug("Loading libz3java");
-            System.loadLibrary(LIBZ3JAVA_NAME);
+            try { System.loadLibrary(LIBZ3JAVA_NAME); }
+            catch (UnsatisfiedLinkError e) { debug("Failed to load " + LIBZ3JAVA_NAME); }
           }
 
           debug("Loading "+LIB_NAME);

src/main/scala/z3/scala/Z3Context.scala

@@ -29,6 +29,7 @@ sealed class Z3Context(val config: Map[String, String]) {
   }
 
   Z3Wrapper.registerContext(ptr, this)
+  Native.setInternalErrorHandler(ptr)
 
   val astQueue       = new Z3RefCountQueue[Z3ASTLike]
   val astVectorQueue = new Z3RefCountQueue[Z3ASTVector]