recfun

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

src/ast/array_decl_plugin.cpp

@@ -253,7 +253,10 @@ func_decl* array_decl_plugin::mk_select(unsigned arity, sort * const * domain) {
         if (!parameters[i].is_ast() || 
             !is_sort(parameters[i].get_ast()) || 
             !m_manager->compatible_sorts(domain[i+1], to_sort(parameters[i].get_ast()))) {
-            m_manager->raise_exception("domain sort and parameter do not match");
+            std::stringstream strm;
+            strm << "domain sort " << sort_ref(domain[i+1], *m_manager) << " and parameter ";
+            strm << parameter_pp(parameters[i], *m_manager) << " do not match";
+            m_manager->raise_exception(strm.str().c_str());
             UNREACHABLE();
             return nullptr;
         }
@@ -292,8 +295,12 @@ func_decl * array_decl_plugin::mk_store(unsigned arity, sort * const * domain) {
             m_manager->raise_exception("expecting sort parameter");
             return nullptr;
         }
-        if (!m_manager->compatible_sorts(to_sort(parameters[i].get_ast()), domain[i+1])) {
-            m_manager->raise_exception("domain sort and parameter do not match");
+        sort* srt1 = to_sort(parameters[i].get_ast());
+        sort* srt2 = domain[i+1];
+        if (!m_manager->compatible_sorts(srt1, srt2)) {
+            std::stringstream strm;
+            strm << "domain sort " << sort_ref(srt2, *m_manager) << " and parameter sort " << sort_ref(srt2, *m_manager) << " do not match";
+            m_manager->raise_exception(strm.str());
             UNREACHABLE();
             return nullptr;
         }
@@ -326,13 +333,13 @@ bool array_decl_plugin::check_set_arguments(unsigned arity, sort * const * domai
         if (domain[i] != domain[0]) {
             std::ostringstream buffer;
             buffer << "arguments " << 1 << " and " << (i+1) << " have different sorts";
-            m_manager->raise_exception(buffer.str().c_str());
+            m_manager->raise_exception(buffer.str());
             return false;
         }
         if (domain[i]->get_family_id() != m_family_id) {
             std::ostringstream buffer;
             buffer << "argument " << (i+1) << " is not of array sort";
-            m_manager->raise_exception(buffer.str().c_str());
+            m_manager->raise_exception(buffer.str());
             return false;
         }
     }

src/ast/ast.cpp

@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#include<sstream>
-#include<cstring>
+#include <sstream>
+#include <cstring>
 #include "ast/ast.h"
 #include "ast/ast_pp.h"
 #include "ast/ast_ll_pp.h"
@@ -1541,6 +1541,20 @@ void ast_manager::raise_exception(char const * msg) {
     throw ast_exception(msg);
 }
 
+void ast_manager::raise_exception(std::string const&  msg) {
+    throw ast_exception(msg.c_str());
+}
+
+std::ostream& ast_manager::display(std::ostream& out, parameter const& p) {
+    switch (p.get_kind()) {
+    case parameter::PARAM_AST:
+        return out << ast_ref(p.get_ast(), *this);
+    default:
+        return p.display(out);
+    }
+    return out;
+}
+
 
 void ast_manager::copy_families_plugins(ast_manager const & from) {
     TRACE("copy_families_plugins",

src/ast/ast.h

@@ -1562,6 +1562,9 @@ public:
 
     // Equivalent to throw ast_exception(msg)
     Z3_NORETURN void raise_exception(char const * msg);
+    Z3_NORETURN void raise_exception(std::string const& s);
+
+    std::ostream& display(std::ostream& out, parameter const& p);
 
     bool is_format_manager() const { return m_format_manager == nullptr; }
 
@@ -2498,6 +2501,16 @@ public:
     void mark(ast * n, bool flag) { if (flag) mark(n); else reset_mark(n); }
 };
 
+struct parameter_pp {
+    parameter const& p;
+    ast_manager& m;
+    parameter_pp(parameter const& p, ast_manager& m): p(p), m(m) {}
+};
+
+inline std::ostream& operator<<(std::ostream& out, parameter_pp const& pp) {
+    return pp.m.display(out, pp.p);
+}
+
 typedef ast_ref_fast_mark<1> ast_ref_fast_mark1;
 typedef ast_ref_fast_mark<2> ast_ref_fast_mark2;
 typedef ast_ref_fast_mark1   expr_ref_fast_mark1;