merge with master branch

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

src/solver/check_sat_result.cpp

@@ -16,7 +16,25 @@ Author:
 Notes:
 
 --*/
-#include"check_sat_result.h"
+#include "solver/check_sat_result.h"
+
+void check_sat_result::set_reason_unknown(event_handler& eh) {
+    switch (eh.caller_id()) {
+    case UNSET_EH_CALLER: break;
+    case CTRL_C_EH_CALLER:
+        set_reason_unknown("interrupted from keyboard");
+        break;
+    case TIMEOUT_EH_CALLER:
+        set_reason_unknown("timeout");
+        break;
+    case RESLIMIT_EH_CALLER:
+        set_reason_unknown("max. resource limit exceeded");
+        break;
+    case API_INTERRUPT_EH_CALLER:
+        set_reason_unknown("interrupted");
+        break;
+    }
+}
 
 simple_check_sat_result::simple_check_sat_result(ast_manager & m):
     m_core(m),

src/solver/check_sat_result.h

@@ -19,9 +19,10 @@ Notes:
 #ifndef CHECK_SAT_RESULT_H_
 #define CHECK_SAT_RESULT_H_
 
-#include"model.h"
-#include"lbool.h"
-#include"statistics.h"
+#include "model/model.h"
+#include "util/lbool.h"
+#include "util/statistics.h"
+#include "util/event_handler.h"
 
 /**
    \brief Abstract interface for the result of a (check-sat) like command.
@@ -57,6 +58,7 @@ public:
     virtual proof * get_proof() = 0;
     virtual std::string reason_unknown() const = 0;
     virtual void set_reason_unknown(char const* msg) = 0;
+    void set_reason_unknown(event_handler& eh);
     virtual void get_labels(svector<symbol> & r) = 0;
     virtual ast_manager& get_manager() const = 0;
 

src/solver/combined_solver.cpp

@@ -18,10 +18,10 @@ Author:
 Notes:
 
 --*/
-#include"solver.h"
-#include"scoped_timer.h"
-#include"combined_solver_params.hpp"
-#include"common_msgs.h"
+#include "solver/solver.h"
+#include "util/scoped_timer.h"
+#include "solver/combined_solver_params.hpp"
+#include "util/common_msgs.h"
 #define PS_VB_LVL 15
 
 /**
@@ -89,8 +89,8 @@ private:
                 m_solver->get_manager().limit().dec_cancel();
             }
         }
-        virtual void operator()() {
-            m_canceled = true;
+        virtual void operator()(event_handler_caller_t caller_id) {
+            m_canceled = true;            
             m_solver->get_manager().limit().inc_cancel();
         }
     };

src/solver/combined_solver.h

@@ -21,7 +21,7 @@ Notes:
 #ifndef COMBINED_SOLVER_H_
 #define COMBINED_SOLVER_H_
 
-#include"params.h"
+#include "util/params.h"
 
 class solver;
 class solver_factory;

src/solver/mus.cpp

@@ -18,11 +18,11 @@ Notes:
 
 --*/
 
-#include "solver.h"
-#include "mus.h"
-#include "ast_pp.h"
-#include "ast_util.h"
-#include "model_evaluator.h"
+#include "solver/solver.h"
+#include "solver/mus.h"
+#include "ast/ast_pp.h"
+#include "ast/ast_util.h"
+#include "model/model_evaluator.h"
 
 
 struct mus::imp {

src/solver/smt_logics.cpp

@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#include "symbol.h"
-#include "smt_logics.h"
+#include "util/symbol.h"
+#include "solver/smt_logics.h"
 
 
 

src/solver/solver.cpp

@@ -16,12 +16,12 @@ Author:
 Notes:
 
 --*/
-#include"solver.h"
-#include"model_evaluator.h"
-#include"ast_util.h"
-#include"ast_pp.h"
-#include"ast_pp_util.h"
-#include "common_msgs.h"
+#include "solver/solver.h"
+#include "model/model_evaluator.h"
+#include "ast/ast_util.h"
+#include "ast/ast_pp.h"
+#include "ast/ast_pp_util.h"
+#include "util/common_msgs.h"
 
 
 unsigned solver::get_num_assertions() const {

src/solver/solver.h

@@ -19,9 +19,9 @@ Notes:
 #ifndef SOLVER_H_
 #define SOLVER_H_
 
-#include"check_sat_result.h"
-#include"progress_callback.h"
-#include"params.h"
+#include "solver/check_sat_result.h"
+#include "solver/progress_callback.h"
+#include "util/params.h"
 
 class solver;
 

src/solver/solver2tactic.cpp

@@ -17,11 +17,11 @@ Notes:
    
 --*/
 
-#include "solver.h"
-#include "tactic.h"
-#include"filter_model_converter.h"
-#include "solver2tactic.h"
-#include "ast_util.h"
+#include "solver/solver.h"
+#include "tactic/tactic.h"
+#include "tactic/filter_model_converter.h"
+#include "solver/solver2tactic.h"
+#include "ast/ast_util.h"
 
 typedef obj_map<expr, expr *> expr2expr_map;
 

src/solver/solver2tactic.h

@@ -19,8 +19,8 @@ Notes:
 #ifndef SOLVER2TACTIC_H_
 #define SOLVER2TACTIC_H_
 
-#include "tactic.h"
-#include "filter_model_converter.h"
+#include "tactic/tactic.h"
+#include "tactic/filter_model_converter.h"
 class solver;
 
 tactic * mk_solver2tactic(solver* s);

src/solver/solver_na2as.cpp

@@ -19,8 +19,8 @@ Author:
 Notes:
 
 --*/
-#include"solver_na2as.h"
-#include"ast_smt2_pp.h"
+#include "solver/solver_na2as.h"
+#include "ast/ast_smt2_pp.h"
 
 
 solver_na2as::solver_na2as(ast_manager & m):

src/solver/solver_na2as.h

@@ -22,7 +22,7 @@ Notes:
 #ifndef SOLVER_NA2AS_H_
 #define SOLVER_NA2AS_H_
 
-#include"solver.h"
+#include "solver/solver.h"
 
 class solver_na2as : public solver {
  protected:

src/solver/tactic2solver.cpp

@@ -19,10 +19,10 @@ Author:
 Notes:
 
 --*/
-#include"solver_na2as.h"
-#include"tactic.h"
-#include"ast_translation.h"
-#include"mus.h"
+#include "solver/solver_na2as.h"
+#include "tactic/tactic.h"
+#include "ast/ast_translation.h"
+#include "solver/mus.h"
 
 /**
    \brief Simulates the incremental solver interface using a tactic.

src/solver/tactic2solver.h

@@ -22,7 +22,7 @@ Notes:
 #ifndef TACTIC2SOLVER_H_
 #define TACTIC2SOLVER_H_
 
-#include"params.h"
+#include "util/params.h"
 class ast_manager;
 class tactic;
 class tactic_factory;