Merge branch 'unstable' of https://git01.codeplex.com/z3 into fpa-api

src/api/api_datalog.cpp

@@ -48,8 +48,11 @@ namespace api {
         if (!m.has_plugin(name)) {
             m.register_plugin(name, alloc(datalog::dl_decl_plugin));
         }        
-        datalog::relation_manager& r = m_context.get_rel_context().get_rmanager();
-        r.register_plugin(alloc(datalog::external_relation_plugin, *this, r));
+        datalog::rel_context* rel = m_context.get_rel_context();
+        if (rel) {
+            datalog::relation_manager& r = rel->get_rmanager();
+            r.register_plugin(alloc(datalog::external_relation_plugin, *this, r));
+        }
     }        
     
     void fixedpoint_context::reduce(func_decl* f, unsigned num_args, expr * const* args, expr_ref& result) {

src/api/java/Status.java

@@ -12,7 +12,7 @@ package com.microsoft.z3;
 public enum Status
 {
     // / Used to signify an unsatisfiable status.
-    UNSATISFIABLE(1),
+    UNSATISFIABLE(-1),
 
     // / Used to signify an unknown status.
     UNKNOWN(0),

src/api/z3_api.h

@@ -780,11 +780,11 @@ typedef enum
         }
         or
         \nicebox{
-             (=> (and ln+1 ln+2 .. ln+m) l0)
+             (=> (and l1 l2 .. ln) l0)
         }
         or in the most general (ground) form:
         \nicebox{
-             (=> (and ln+1 ln+2 .. ln+m) (or l0 l1 .. ln-1))
+             (=> (and ln+1 ln+2 .. ln+m) (or l0 l1 .. ln))
         }
         In other words we use the following (Prolog style) convention for Horn 
         implications:
@@ -800,7 +800,7 @@ typedef enum
         general non-ground form is:
 
         \nicebox{
-             (forall (vars) (=> (and ln+1 ln+2 .. ln+m) (or l0 l1 .. ln-1)))
+             (forall (vars) (=> (and ln+1 ln+2 .. ln+m) (or l0 l1 .. ln)))
         }
 
         The hyper-resolution rule takes a sequence of parameters.

src/api/z3_replayer.cpp

@@ -26,6 +26,7 @@ Notes:
 void register_z3_replayer_cmds(z3_replayer & in);
 
 void throw_invalid_reference() {
+    TRACE("z3_replayer", tout << "invalid argument reference\n";);
     throw z3_replayer_exception("invalid argument reference");
 }