mirror of
https://github.com/Z3Prover/z3
synced 2025-04-27 19:05:51 +00:00
remove refs to bare_str
This commit is contained in:
parent
405a26c585
commit
011c1b2dd2
11 changed files with 46 additions and 49 deletions
|
@ -64,7 +64,7 @@ namespace datalog {
|
|||
}
|
||||
|
||||
symbol finite_product_relation_plugin::get_name(relation_plugin & inner_plugin) {
|
||||
std::string str = std::string("fpr_")+inner_plugin.get_name().bare_str();
|
||||
std::string str = std::string("fpr_")+inner_plugin.get_name().str();
|
||||
return symbol(str.c_str());
|
||||
}
|
||||
|
||||
|
|
|
@ -213,10 +213,10 @@ namespace datalog {
|
|||
return true;
|
||||
}
|
||||
void make_annotations(execution_context & ctx) override {
|
||||
ctx.set_register_annotation(m_reg, m_pred->get_name().bare_str());
|
||||
ctx.set_register_annotation(m_reg, m_pred->get_name().str().c_str());
|
||||
}
|
||||
std::ostream& display_head_impl(execution_context const& ctx, std::ostream & out) const override {
|
||||
const char * rel_name = m_pred->get_name().bare_str();
|
||||
auto rel_name = m_pred->get_name();
|
||||
if (m_store) {
|
||||
return out << "store " << m_reg << " into " << rel_name;
|
||||
}
|
||||
|
@ -378,7 +378,7 @@ namespace datalog {
|
|||
if (!fn) {
|
||||
throw default_exception(default_exception::fmt(),
|
||||
"trying to perform unsupported join operation on relations of kinds %s and %s",
|
||||
r1.get_plugin().get_name().bare_str(), r2.get_plugin().get_name().bare_str());
|
||||
r1.get_plugin().get_name().str().c_str(), r2.get_plugin().get_name().str().c_str());
|
||||
}
|
||||
store_fn(r1, r2, fn);
|
||||
}
|
||||
|
@ -441,7 +441,7 @@ namespace datalog {
|
|||
if (!fn) {
|
||||
throw default_exception(default_exception::fmt(),
|
||||
"trying to perform unsupported filter_equal operation on a relation of kind %s",
|
||||
r.get_plugin().get_name().bare_str());
|
||||
r.get_plugin().get_name().str().c_str());
|
||||
}
|
||||
store_fn(r, fn);
|
||||
}
|
||||
|
@ -490,7 +490,7 @@ namespace datalog {
|
|||
if (!fn) {
|
||||
throw default_exception(default_exception::fmt(),
|
||||
"trying to perform unsupported filter_identical operation on a relation of kind %s",
|
||||
r.get_plugin().get_name().bare_str());
|
||||
r.get_plugin().get_name().str().c_str());
|
||||
}
|
||||
store_fn(r, fn);
|
||||
}
|
||||
|
@ -537,7 +537,7 @@ namespace datalog {
|
|||
if (!fn) {
|
||||
throw default_exception(default_exception::fmt(),
|
||||
"trying to perform unsupported filter_interpreted operation on a relation of kind %s",
|
||||
r.get_plugin().get_name().bare_str());
|
||||
r.get_plugin().get_name().str().c_str());
|
||||
}
|
||||
store_fn(r, fn);
|
||||
}
|
||||
|
@ -594,7 +594,7 @@ namespace datalog {
|
|||
if (!fn) {
|
||||
throw default_exception(default_exception::fmt(),
|
||||
"trying to perform unsupported filter_interpreted_and_project operation on a relation of kind %s",
|
||||
reg.get_plugin().get_name().bare_str());
|
||||
reg.get_plugin().get_name().str().c_str());
|
||||
}
|
||||
store_fn(reg, fn);
|
||||
}
|
||||
|
@ -837,7 +837,7 @@ namespace datalog {
|
|||
if (!fn) {
|
||||
throw default_exception(default_exception::fmt(),
|
||||
"trying to perform unsupported join-project operation on relations of kinds %s and %s",
|
||||
r1.get_plugin().get_name().bare_str(), r2.get_plugin().get_name().bare_str());
|
||||
r1.get_plugin().get_name().str().c_str(), r2.get_plugin().get_name().str().c_str());
|
||||
}
|
||||
store_fn(r1, r2, fn);
|
||||
}
|
||||
|
@ -910,7 +910,7 @@ namespace datalog {
|
|||
if (!fn) {
|
||||
throw default_exception(default_exception::fmt(),
|
||||
"trying to perform unsupported select_equal_and_project operation on a relation of kind %s",
|
||||
r.get_plugin().get_name().bare_str());
|
||||
r.get_plugin().get_name().str().c_str());
|
||||
}
|
||||
store_fn(r, fn);
|
||||
}
|
||||
|
@ -1076,7 +1076,7 @@ namespace datalog {
|
|||
return true;
|
||||
}
|
||||
std::ostream& display_head_impl(execution_context const& ctx, std::ostream & out) const override {
|
||||
return out << "mark_saturated " << m_pred->get_name().bare_str();
|
||||
return out << "mark_saturated " << m_pred->get_name();
|
||||
}
|
||||
void make_annotations(execution_context & ctx) override {
|
||||
}
|
||||
|
|
|
@ -33,7 +33,7 @@ namespace datalog {
|
|||
// -----------------------------------
|
||||
|
||||
symbol table_relation_plugin::create_plugin_name(const table_plugin &p) {
|
||||
std::string name = std::string("tr_") + p.get_name().bare_str();
|
||||
std::string name = std::string("tr_") + p.get_name().str();
|
||||
return symbol(name.c_str());
|
||||
}
|
||||
|
||||
|
|
|
@ -157,7 +157,7 @@ namespace datalog {
|
|||
//IF_VERBOSE(3, m_context.display_smt2(0,0,verbose_stream()););
|
||||
|
||||
if (m_context.print_aig().is_non_empty_string()) {
|
||||
const char *filename = m_context.print_aig().bare_str();
|
||||
std::string filename = m_context.print_aig().str();
|
||||
aig_exporter aig(m_context.get_rules(), get_context(), &m_table_facts);
|
||||
std::ofstream strm(filename, std::ios_base::binary);
|
||||
aig(strm);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue