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

src/api/java/Solver.java

@@ -127,13 +127,13 @@ public class Solver extends Z3Object
      * using the Boolean constants in ps.
      *
      * Remarks: 
-     * This API is an alternative to <see cref="Check"/> with assumptions for
+     * This API is an alternative to {@link check} with assumptions for
      * extracting unsat cores.
      * Both APIs can be used in the same solver. The unsat core will contain a
      * combination
-     * of the Boolean variables provided using <see cref="AssertAndTrack"/>
+     * of the Boolean variables provided using {@link assertAndTrack}
      * and the Boolean literals
-     * provided using <see cref="Check"/> with assumptions.
+     * provided using {@link check} with assumptions.
      **/
     public void assertAndTrack(BoolExpr[] constraints, BoolExpr[] ps)
     {
@@ -152,13 +152,13 @@ public class Solver extends Z3Object
      * using the Boolean constant p.
      * 
      * Remarks: 
-     * This API is an alternative to <see cref="Check"/> with assumptions for
+     * This API is an alternative to {@link check} with assumptions for
      * extracting unsat cores.
      * Both APIs can be used in the same solver. The unsat core will contain a
      * combination
-     * of the Boolean variables provided using <see cref="AssertAndTrack"/>
+     * of the Boolean variables provided using {@link assertAndTrack}
      * and the Boolean literals
-     * provided using <see cref="Check"/> with assumptions.
+     * provided using {@link check} with assumptions.
      */ 
     public void assertAndTrack(BoolExpr constraint, BoolExpr p)
     {
@@ -294,7 +294,7 @@ public class Solver extends Z3Object
     }
 
     /**
-     * Create a clone of the current solver with respect to <c>ctx</c>.
+     * Create a clone of the current solver with respect to{@code ctx}.
      */
     public Solver translate(Context ctx) 
     {

src/ast/fpa/fpa2bv_converter.cpp

@@ -419,11 +419,16 @@ void fpa2bv_converter::add_core(unsigned sbits, unsigned ebits,
 
     dbg_decouple("fpa2bv_add_exp_delta", exp_delta);
 
+    if (log2(sbits + 2) < ebits + 2)
+    {
         // cap the delta
         expr_ref cap(m), cap_le_delta(m);
-    cap = m_bv_util.mk_numeral(sbits+2, ebits);
+        cap = m_bv_util.mk_numeral(sbits + 2, ebits + 2);
-    cap_le_delta = m_bv_util.mk_ule(cap, exp_delta);
+        cap_le_delta = m_bv_util.mk_ule(cap, m_bv_util.mk_zero_extend(2, exp_delta));
-    m_simp.mk_ite(cap_le_delta, cap, exp_delta, exp_delta);
+        m_simp.mk_ite(cap_le_delta, cap, m_bv_util.mk_zero_extend(2, exp_delta), exp_delta);
+        exp_delta = m_bv_util.mk_extract(ebits - 1, 0, exp_delta);
+        dbg_decouple("fpa2bv_add_exp_cap", cap);
+    }
 
     dbg_decouple("fpa2bv_add_exp_delta_capped", exp_delta);
 

src/ast/seq_decl_plugin.cpp

@@ -3,11 +3,11 @@ Copyright (c) 2011 Microsoft Corporation
 
 Module Name:
 
-    dl_decl_plugin.h
+    seq_decl_plugin.h
 
 Abstract:
 
-    <abstract>
+    decl_plugin for the theory of sequences
 
 Author:
 

src/ast/seq_decl_plugin.h

@@ -7,7 +7,7 @@ Module Name:
 
 Abstract:
 
-    <abstract>
+    decl_plugin for the theory of sequences
 
 Author:
 

src/ast/simplifier/fpa_simplifier_plugin.cpp

@@ -28,12 +28,12 @@ bool fpa_simplifier_plugin::reduce(func_decl * f, unsigned num_args, expr * cons
 
     SASSERT(f->get_family_id() == get_family_id());
 
-    return m_rw.mk_app_core(f, num_args, args, result) == BR_DONE;
+    return m_rw.mk_app_core(f, num_args, args, result) != BR_FAILED;
 }
 
 bool fpa_simplifier_plugin::reduce_eq(expr * lhs, expr * rhs, expr_ref & result) {
     set_reduce_invoked();
 
-    return m_rw.mk_eq_core(lhs, rhs, result) == BR_DONE;
+    return m_rw.mk_eq_core(lhs, rhs, result) != BR_FAILED;
 }
 

src/ast/simplifier/seq_simplifier_plugin.cpp

@@ -7,7 +7,7 @@ Module Name:
 
 Abstract:
 
-    Simplifier for the floating-point theory
+    Simplifier for the theory of sequences
 
 Author:
 

src/smt/theory_fpa.cpp

@@ -26,17 +26,17 @@ namespace smt {
 
     class fpa2bv_conversion_trail_elem : public trail<theory_fpa> {
         ast_manager & m;
-        obj_map<expr, expr*> & m_conversions;
+        obj_map<expr, expr*> & m_map;
-        expr * m_e;
+        expr_ref key;
     public:
-        fpa2bv_conversion_trail_elem(ast_manager & m, obj_map<expr, expr*> & c, expr * e) :
+        fpa2bv_conversion_trail_elem(ast_manager & m, obj_map<expr, expr*> & map, expr * e) :
-            m(m), m_conversions(c), m_e(e) { m.inc_ref(e); }
+            m(m), m_map(map), key(e, m) { }
         virtual ~fpa2bv_conversion_trail_elem() { }
         virtual void undo(theory_fpa & th) {
-            expr * v = m_conversions.find(m_e);
+            expr * val = m_map.find(key);
-            m_conversions.remove(m_e);
+            m_map.remove(key);
-            m.dec_ref(v);
+            m.dec_ref(val);
-            m.dec_ref(m_e);
+            key = 0;
         }
     };
 
@@ -153,6 +153,8 @@ namespace smt {
 
     theory_fpa::~theory_fpa()
     {
+        m_trail_stack.reset();
+
         if (m_is_initialized) {
             ast_manager & m = get_manager();
             dec_ref_map_values(m, m_conversions);