mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-06-06 06:03:23 +00:00
Code Activity

fix regression reported in #1159

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2017-07-25 10:18:21 -07:00
parent 49f88d9d90
commit 70f6280bf1
4 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/ast/ast_smt2_pp.cpp
View file

@ -431,6 +431,7 @@ format_ns::format * smt2_pp_environment::pp_sort(sort * s) {
fs.push_back(pp_sort(to_sort(s->get_parameter(0).get_ast()))); fs.push_back(pp_sort(to_sort(s->get_parameter(0).get_ast())));
return mk_seq1(m, fs.begin(), fs.end(), f2f(), get_sutil().is_seq(s)?"Seq":"Re"); return mk_seq1(m, fs.begin(), fs.end(), f2f(), get_sutil().is_seq(s)?"Seq":"Re");
} }
#if 0
if (get_dtutil().is_datatype(s)) { if (get_dtutil().is_datatype(s)) {
ptr_buffer<format> fs; ptr_buffer<format> fs;
unsigned sz = get_dtutil().get_datatype_num_parameter_sorts(s); unsigned sz = get_dtutil().get_datatype_num_parameter_sorts(s);
@ -439,6 +440,7 @@ format_ns::format * smt2_pp_environment::pp_sort(sort * s) {
} }
return mk_seq1(m, fs.begin(), fs.end(), f2f(), s->get_name().str().c_str()); return mk_seq1(m, fs.begin(), fs.end(), f2f(), s->get_name().str().c_str());
} }
#endif
return format_ns::mk_string(get_manager(), s->get_name().str().c_str()); return format_ns::mk_string(get_manager(), s->get_name().str().c_str());
} }

4
src/ast/ast_smt_pp.cpp
View file

@ -366,13 +366,14 @@ class smt_printer {
return; return;
} }
else if (s->is_sort_of(m_dt_fid, DATATYPE_SORT)) { else if (s->is_sort_of(m_dt_fid, DATATYPE_SORT)) {
m_out << m_renaming.get_symbol(s->get_name());
#if 0
datatype_util util(m_manager); datatype_util util(m_manager);
unsigned num_sorts = util.get_datatype_num_parameter_sorts(s); unsigned num_sorts = util.get_datatype_num_parameter_sorts(s);
if (num_sorts > 0) { if (num_sorts > 0) {
m_out << "("; m_out << "(";
} }
m_out << m_renaming.get_symbol(s->get_name());
if (num_sorts > 0) { if (num_sorts > 0) {
for (unsigned i = 0; i < num_sorts; ++i) { for (unsigned i = 0; i < num_sorts; ++i) {
m_out << " "; m_out << " ";
@ -380,6 +381,7 @@ class smt_printer {
} }
m_out << ")"; m_out << ")";
} }
#endif
return; return;
} }
else { else {

2
src/util/lp/lp_settings_instances.cpp
View file

@ -2,8 +2,8 @@
Copyright (c) 2017 Microsoft Corporation Copyright (c) 2017 Microsoft Corporation
Author: Lev Nachmanson Author: Lev Nachmanson
*/ */
#include "util/vector.h"
#include <memory> #include <memory>
#include "util/vector.h"
#include "util/lp/lp_settings.hpp" #include "util/lp/lp_settings.hpp"
template bool lean::vectors_are_equal<double>(vector<double> const&, vector<double> const&); template bool lean::vectors_are_equal<double>(vector<double> const&, vector<double> const&);
template bool lean::vectors_are_equal<lean::mpq>(vector<lean::mpq > const&, vector<lean::mpq> const&); template bool lean::vectors_are_equal<lean::mpq>(vector<lean::mpq > const&, vector<lean::mpq> const&);

2
src/util/lp/row_eta_matrix_instances.cpp
View file

@ -2,8 +2,8 @@
Copyright (c) 2017 Microsoft Corporation Copyright (c) 2017 Microsoft Corporation
Author: Lev Nachmanson Author: Lev Nachmanson
*/ */
#include "util/vector.h"
#include <memory> #include <memory>
#include "util/vector.h"
#include "util/lp/row_eta_matrix.hpp" #include "util/lp/row_eta_matrix.hpp"
#include "util/lp/lu.h" #include "util/lp/lu.h"
namespace lean { namespace lean {