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

src/ast/expr2polynomial.cpp

@@ -23,6 +23,7 @@ Notes:
 #include"ast_smt2_pp.h"
 #include"z3_exception.h"
 #include"cooperate.h"
+#include"common_msgs.h"
 
 struct expr2polynomial::imp {
     struct frame {
@@ -94,7 +95,7 @@ struct expr2polynomial::imp {
 
     void checkpoint() {
         if (m_cancel)
-            throw default_exception("canceled");
+            throw default_exception(Z3_CANCELED_MSG);
         cooperate("expr2polynomial");
     }
 

src/math/interval/interval_def.h

@@ -24,6 +24,7 @@ Revision History:
 #include"trace.h"
 #include"scoped_numeral.h"
 #include"cooperate.h"
+#include"common_msgs.h"
 
 #define DEFAULT_PI_PRECISION 2
 
@@ -63,7 +64,7 @@ void interval_manager<C>::del(interval & a) {
 template<typename C>
 void interval_manager<C>::checkpoint() {
     if (!m_limit.inc())
-        throw default_exception("canceled");
+        throw default_exception(Z3_CANCELED_MSG);
     cooperate("interval");
 }
 

src/math/polynomial/algebraic_numbers.cpp

@@ -26,6 +26,7 @@ Notes:
 #include"mpbqi.h"
 #include"timeit.h"
 #include"algebraic_params.hpp"
+#include"common_msgs.h"
 
 namespace algebraic_numbers {
 
@@ -126,7 +127,7 @@ namespace algebraic_numbers {
 
         void checkpoint() {
             if (!m_limit.inc())
-                throw algebraic_exception("canceled");
+                throw algebraic_exception(Z3_CANCELED_MSG);
             cooperate("algebraic");
         }
 

src/math/polynomial/polynomial.cpp

@@ -34,6 +34,7 @@ Notes:
 #include"linear_eq_solver.h"
 #include"scoped_numeral_buffer.h"
 #include"ref_buffer.h"
+#include"common_msgs.h"
 
 namespace polynomial {
 
@@ -2374,7 +2375,7 @@ namespace polynomial {
 
         void checkpoint() {
             if (!m_limit.inc()) {
-                throw polynomial_exception("canceled");
+                throw polynomial_exception(Z3_CANCELED_MSG);
             }
             cooperate("polynomial");
         }

src/math/polynomial/upolynomial.cpp

@@ -26,6 +26,7 @@ Notes:
 #include"polynomial_primes.h"
 #include"buffer.h"
 #include"cooperate.h"
+#include"common_msgs.h"
 
 namespace upolynomial {
 
@@ -155,7 +156,7 @@ namespace upolynomial {
 
     void core_manager::checkpoint() {
         if (!m_limit.inc())
-            throw upolynomial_exception("canceled");
+            throw upolynomial_exception(Z3_CANCELED_MSG);
         cooperate("upolynomial");
     }
 

src/math/realclosure/realclosure.cpp

@@ -29,6 +29,7 @@ Notes:
 #include"ref_vector.h"
 #include"ref_buffer.h"
 #include"cooperate.h"
+#include"common_msgs.h"
 
 #ifndef REALCLOSURE_INI_BUFFER_SIZE
 #define REALCLOSURE_INI_BUFFER_SIZE 32
@@ -548,7 +549,7 @@ namespace realclosure {
 
         void checkpoint() {
             if (!m_limit.inc())
-                throw exception("canceled");
+                throw exception(Z3_CANCELED_MSG);
             cooperate("rcf");
         }
 

src/math/subpaving/subpaving_t_def.h

@@ -460,7 +460,7 @@ context_t<C>::~context_t() {
 template<typename C>
 void context_t<C>::checkpoint() {
     if (!m_limit.inc())
-        throw default_exception("canceled");
+        throw default_exception(Z3_CANCELED_MSG);
     if (memory::get_allocation_size() > m_max_memory)
         throw default_exception(Z3_MAX_MEMORY_MSG);
     cooperate("subpaving");

src/math/subpaving/tactic/expr2subpaving.cpp

@@ -24,6 +24,7 @@ Notes:
 #include"cooperate.h"
 #include"arith_decl_plugin.h"
 #include"scoped_numeral_buffer.h"
+#include"common_msgs.h"
 
 struct expr2subpaving::imp {
     struct frame {
@@ -94,7 +95,7 @@ struct expr2subpaving::imp {
 
     void checkpoint() {
         if (m().canceled())
-            throw default_exception("canceled");
+            throw default_exception(Z3_CANCELED_MSG);
         cooperate("expr2subpaving");
     }
 

src/muz/bmc/dl_bmc_engine.cpp

@@ -1510,7 +1510,7 @@ namespace datalog {
 
     void bmc::checkpoint() {
         if (m.canceled()) {
-            throw default_exception("bmc canceled");
+            throw default_exception(Z3_CANCELED_MSG);
         }
     }
 

src/muz/duality/duality_dl_interface.cpp

@@ -328,7 +328,7 @@ namespace Duality {
             ans = rs->Solve();
         }
         catch (Duality::solver::cancel_exception &exn){
-            throw default_exception("duality canceled");
+            throw default_exception(Z3_CANCELED_MSG);
         }
         catch (Duality::Solver::Incompleteness &exn){
             throw default_exception("incompleteness");

src/muz/pdr/pdr_context.cpp

@@ -1911,7 +1911,7 @@ namespace pdr {
 
     void context::checkpoint() {
         if (m.canceled()) {
-            throw default_exception("pdr canceled");
+            throw default_exception(Z3_CANCELED_MSG);
         }
     }
 

src/smt/tactic/smt_tactic.cpp

@@ -225,7 +225,7 @@ public:
                 }
             }
             if (m_ctx->canceled()) {
-                throw tactic_exception("smt_tactic canceled");
+                throw tactic_exception(Z3_CANCELED_MSG);
             }
 
             lbool r;

src/tactic/nlsat_smt/nl_purify_tactic.cpp

@@ -289,7 +289,7 @@ private:
 
     void check_point() {
         if (m.canceled()) {
-            throw tactic_exception("canceled");
+            throw tactic_exception(Z3_CANCELED_MSG);
         }
     }