mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-24 01:25:31 +00:00
Code Activity

merge with master

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2017-05-07 17:05:57 -07:00
commit b915f78281
62 changed files with 12564 additions and 167 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/shell/opt_frontend.cpp
View file

@ -20,12 +20,12 @@ static opt::context* g_opt = 0;
static double g_start_time = 0;
static unsigned_vector g_handles;
class stream_buffer {
class opt_stream_buffer {
std::istream & m_stream;
int m_val;
unsigned m_line;
public:
stream_buffer(std::istream & s):
opt_stream_buffer(std::istream & s):
m_stream(s),
m_line(0) {
m_val = m_stream.get();
@ -111,7 +111,7 @@ public:
class wcnf {
opt::context& opt;
ast_manager& m;
stream_buffer& in;
opt_stream_buffer& in;
app_ref read_clause(unsigned& weight) {
int parsed_lit;
@ -141,7 +141,7 @@ class wcnf {
public:
wcnf(opt::context& opt, stream_buffer& in): opt(opt), m(opt.get_manager()), in(in) {
wcnf(opt::context& opt, opt_stream_buffer& in): opt(opt), m(opt.get_manager()), in(in) {
opt.set_clausal(true);
}
@ -180,7 +180,7 @@ public:
class opb {
opt::context& opt;
ast_manager& m;
stream_buffer& in;
opt_stream_buffer& in;
arith_util arith;
app_ref parse_id() {
@ -264,7 +264,7 @@ class opb {
opt.add_hard_constraint(t);
}
public:
opb(opt::context& opt, stream_buffer& in):
opb(opt::context& opt, opt_stream_buffer& in):
opt(opt), m(opt.get_manager()),
in(in), arith(m) {}
@ -348,7 +348,7 @@ static unsigned parse_opt(std::istream& in, bool is_wcnf) {
g_opt = &opt;
params_ref p = gparams::get_module("opt");
opt.updt_params(p);
stream_buffer _in(in);
opt_stream_buffer _in(in);
if (is_wcnf) {
wcnf wcnf(opt, _in);
wcnf.parse();