mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-25 18:15:32 +00:00
Code Activity

Use nullptr.

Browse source
This commit is contained in:
Bruce Mitchener 2018-02-12 14:05:55 +07:00
parent f01328c65f
commit 76eb7b9ede
625 changed files with 4639 additions and 4639 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/parsers/smt2/marshal.cpp
View file

@ -36,7 +36,7 @@ std::string marshal(expr_ref e, ast_manager &m) {
expr_ref unmarshal(std::istream &is, ast_manager &m) {
cmd_context ctx(false, &m);
ctx.set_ignore_check(true);
if (!parse_smt2_commands(ctx, is)) { return expr_ref(0, m); }
if (!parse_smt2_commands(ctx, is)) { return expr_ref(nullptr, m); }
ptr_vector<expr>::const_iterator it = ctx.begin_assertions();
ptr_vector<expr>::const_iterator end = ctx.end_assertions();

114
src/parsers/smt2/smt2parser.cpp
View file

@ -46,7 +46,7 @@ namespace smt2 {
struct local {
expr * m_term;
unsigned m_level;
local():m_term(0), m_level(0) {}
local():m_term(nullptr), m_level(0) {}
local(expr * t, unsigned l):m_term(t), m_level(l) {}
};
symbol_table<local> m_env;
@ -222,31 +222,31 @@ namespace smt2 {
}
psort_ref_vector & psort_stack() {
if (m_psort_stack.get() == 0)
if (m_psort_stack.get() == nullptr)
m_psort_stack = alloc(psort_ref_vector, pm());
return *(m_psort_stack.get());
}
sort_ref_vector & sort_stack() {
if (m_sort_stack.get() == 0)
if (m_sort_stack.get() == nullptr)
m_sort_stack = alloc(sort_ref_vector, m());
return *(m_sort_stack.get());
}
expr_ref_vector & expr_stack() {
if (m_expr_stack.get() == 0)
if (m_expr_stack.get() == nullptr)
m_expr_stack = alloc(expr_ref_vector, m());
return *(m_expr_stack.get());
}
template<typename T>
static unsigned size(scoped_ptr<T> & v) {
return v.get() == 0 ? 0 : v->size();
return v.get() == nullptr ? 0 : v->size();
}
template<typename T>
static void shrink(scoped_ptr<T> & v, unsigned old_sz) {
if (v.get() == 0) {
if (v.get() == nullptr) {
SASSERT(old_sz == 0);
}
else {
@ -255,13 +255,13 @@ namespace smt2 {
}
expr_ref_vector & pattern_stack() {
if (m_pattern_stack.get() == 0)
if (m_pattern_stack.get() == nullptr)
m_pattern_stack = alloc(expr_ref_vector, m());
return *(m_pattern_stack.get());
}
expr_ref_vector & nopattern_stack() {
if (m_nopattern_stack.get() == 0)
if (m_nopattern_stack.get() == nullptr)
m_nopattern_stack = alloc(expr_ref_vector, m());
return *(m_nopattern_stack.get());
}
@ -271,44 +271,44 @@ namespace smt2 {
}
sexpr_ref_vector & sexpr_stack() {
if (m_sexpr_stack.get() == 0)
if (m_sexpr_stack.get() == nullptr)
m_sexpr_stack = alloc(sexpr_ref_vector, sm());
return *(m_sexpr_stack.get());
}
arith_util & autil() {
if (m_arith_util.get() == 0)
if (m_arith_util.get() == nullptr)
m_arith_util = alloc(arith_util, m());
return *(m_arith_util.get());
}
datatype_util & dtutil() {
if (m_datatype_util.get() == 0)
if (m_datatype_util.get() == nullptr)
m_datatype_util = alloc(datatype_util, m());
return *(m_datatype_util.get());
}
seq_util & sutil() {
if (m_seq_util.get() == 0)
if (m_seq_util.get() == nullptr)
m_seq_util = alloc(seq_util, m());
return *(m_seq_util.get());
}
bv_util & butil() {
if (m_bv_util.get() == 0)
if (m_bv_util.get() == nullptr)
m_bv_util = alloc(bv_util, m());
return *(m_bv_util.get());
}
pattern_validator & pat_validator() {
if (m_pattern_validator.get() == 0) {
if (m_pattern_validator.get() == nullptr) {
m_pattern_validator = alloc(pattern_validator, m());
}
return *(m_pattern_validator.get());
}
var_shifter & shifter() {
if (m_var_shifter.get() == 0)
if (m_var_shifter.get() == nullptr)
m_var_shifter = alloc(var_shifter, m());
return *(m_var_shifter.get());
}
@ -569,12 +569,12 @@ namespace smt2 {
SASSERT(curr_is_identifier());
symbol id = curr_id();
psort_decl * d = m_ctx.find_psort_decl(id);
if (d == 0)
if (d == nullptr)
unknown_sort(id, context);
if (!d->has_var_params() && d->get_num_params() != 0)
throw parser_exception("sort constructor expects parameters");
sort * r = d->instantiate(pm());
if (r == 0)
if (r == nullptr)
throw parser_exception("invalid sort application");
next();
return r;
@ -584,7 +584,7 @@ namespace smt2 {
SASSERT(curr_is_identifier());
symbol id = curr_id();
psort_decl * d = m_ctx.find_psort_decl(id);
if (d != 0) {
if (d != nullptr) {
if (!d->has_var_params() && d->get_num_params() != 0)
throw parser_exception("sort constructor expects parameters");
next();
@ -601,7 +601,7 @@ namespace smt2 {
unknown_sort(id);
UNREACHABLE();
}
return 0;
return nullptr;
}
}
}
@ -612,7 +612,7 @@ namespace smt2 {
next();
symbol id = check_identifier_next("invalid indexed sort, symbol expected");
psort_decl * d = m_ctx.find_psort_decl(id);
if (d == 0)
if (d == nullptr)
unknown_sort(id);
sbuffer<unsigned> args;
while (!curr_is_rparen()) {
@ -624,7 +624,7 @@ namespace smt2 {
if (args.empty())
throw parser_exception("invalid indexed sort, index expected");
sort * r = d->instantiate(pm(), args.size(), args.c_ptr());
if (r == 0)
if (r == nullptr)
throw parser_exception("invalid sort application");
next();
return r;
@ -634,7 +634,7 @@ namespace smt2 {
SASSERT(curr_is_identifier());
symbol id = curr_id();
psort_decl * d = m_ctx.find_psort_decl(id);
if (d == 0) {
if (d == nullptr) {
unknown_sort(id);
}
next();
@ -697,7 +697,7 @@ namespace smt2 {
SASSERT(curr_is_identifier());
symbol id = curr_id();
psort_decl * d = m_ctx.find_psort_decl(id);
if (d == 0)
if (d == nullptr)
unknown_sort(id);
next();
void * mem = m_stack.allocate(sizeof(sort_frame));
@ -717,7 +717,7 @@ namespace smt2 {
throw parser_exception("invalid number of parameters to sort constructor");
}
sort * r = d->instantiate(pm(), num, sort_stack().c_ptr() + spos);
if (r == 0)
if (r == nullptr)
throw parser_exception("invalid sort application");
sort_stack().shrink(spos);
sort_stack().push_back(r);
@ -783,7 +783,7 @@ namespace smt2 {
SASSERT(curr_is_identifier());
psort * p = parse_psort_name(true);
ptype result;
if (p != 0) {
if (p != nullptr) {
result = ptype(p);
}
else {
@ -828,7 +828,7 @@ namespace smt2 {
symbol r_name(r_str.c_str());
next();
TRACE("datatype_parser_bug", tout << ct_name << " " << r_name << "\n";);
ct_decls.push_back(pm().mk_pconstructor_decl(m_sort_id2param_idx.size(), ct_name, r_name, 0, 0));
ct_decls.push_back(pm().mk_pconstructor_decl(m_sort_id2param_idx.size(), ct_name, r_name, 0, nullptr));
}
else {
check_lparen_next("invalid datatype declaration, '(' or ')' expected");
@ -999,13 +999,13 @@ namespace smt2 {
TRACE("name_expr", tout << "naming: " << s << " ->\n" << mk_pp(n, m()) << "\n";);
if (!is_ground(n) && has_free_vars(n))
throw parser_exception("invalid named expression, expression contains free variables");
m_ctx.insert(s, 0, 0, n);
m_ctx.insert(s, 0, nullptr, n);
m_last_named_expr.first = s;
m_last_named_expr.second = n;
}
bool in_quant_ctx(attr_expr_frame * fr) {
return fr != 0 && fr->m_prev != 0 && fr->m_prev->m_kind == EF_QUANT;
return fr != nullptr && fr->m_prev != nullptr && fr->m_prev->m_kind == EF_QUANT;
}
void check_in_quant_ctx(attr_expr_frame * fr) {
@ -1018,7 +1018,7 @@ namespace smt2 {
return;
if (fr->m_last_symbol == m_pattern) {
expr * pat = expr_stack().back();
if (pat == 0) {
if (pat == nullptr) {
if (!ignore_bad_patterns())
throw parser_exception("invalid empty pattern");
}
@ -1191,7 +1191,7 @@ namespace smt2 {
if (!ignore_bad_patterns())
throw parser_exception("invalid pattern, '(' expected");
consume_sexpr();
expr_stack().push_back(0); // empty pattern
expr_stack().push_back(nullptr); // empty pattern
return;
}
@ -1203,7 +1203,7 @@ namespace smt2 {
}
else if (curr_is_rparen()) {
next();
expr_stack().push_back(0); // empty pattern
expr_stack().push_back(nullptr); // empty pattern
}
else {
// unary pattern
@ -1211,7 +1211,7 @@ namespace smt2 {
// when Simplify benchmarks were converted into SMT2 ones.
if (curr_is_identifier()) {
symbol id = curr_id();
func_decl * f = 0;
func_decl * f = nullptr;
try {
f = m_ctx.find_func_decl(id);
}
@ -1223,7 +1223,7 @@ namespace smt2 {
while (!curr_is_rparen())
consume_sexpr();
next();
expr_stack().push_back(0); // empty pattern
expr_stack().push_back(nullptr); // empty pattern
return; // no frame is created
}
}
@ -1761,7 +1761,7 @@ namespace smt2 {
return;
}
expr_ref t_ref(m());
m_ctx.mk_app(r, 0, 0, num_indices, m_param_stack.c_ptr() + param_spos, has_as ? sort_stack().back() : 0, t_ref);
m_ctx.mk_app(r, 0, nullptr, num_indices, m_param_stack.c_ptr() + param_spos, has_as ? sort_stack().back() : nullptr, t_ref);
m_param_stack.shrink(param_spos);
expr_stack().push_back(t_ref.get());
if (has_as) {
@ -1851,7 +1851,7 @@ namespace smt2 {
expr_stack().c_ptr() + fr->m_expr_spos,
num_indices,
m_param_stack.c_ptr() + fr->m_param_spos,
fr->m_as_sort ? sort_stack().back() : 0,
fr->m_as_sort ? sort_stack().back() : nullptr,
t_ref);
expr_stack().shrink(fr->m_expr_spos);
m_param_stack.shrink(fr->m_param_spos);
@ -2050,7 +2050,7 @@ namespace smt2 {
parse_bv_numeral();
break;
case scanner::LEFT_PAREN:
push_expr_frame(m_num_expr_frames == 0 ? 0 : static_cast<expr_frame*>(m_stack.top()));
push_expr_frame(m_num_expr_frames == 0 ? nullptr : static_cast<expr_frame*>(m_stack.top()));
break;
case scanner::KEYWORD_TOKEN:
throw parser_exception("invalid expression, unexpected keyword");
@ -2149,17 +2149,17 @@ namespace smt2 {
check_identifier("invalid sort declaration, symbol expected");
symbol id = curr_id();
if (m_ctx.find_psort_decl(id) != 0)
if (m_ctx.find_psort_decl(id) != nullptr)
throw parser_exception("invalid sort declaration, sort already declared/defined");
next();
if (curr_is_rparen()) {
psort_decl * decl = pm().mk_psort_user_decl(0, id, 0);
psort_decl * decl = pm().mk_psort_user_decl(0, id, nullptr);
m_ctx.insert(decl);
}
else {
check_int("invalid sort declaration, arity (<numeral>) or ')' expected");
unsigned u = curr_unsigned();
psort_decl * decl = pm().mk_psort_user_decl(u, id, 0);
psort_decl * decl = pm().mk_psort_user_decl(u, id, nullptr);
m_ctx.insert(decl);
next();
check_rparen("invalid sort declaration, ')' expected");
@ -2174,7 +2174,7 @@ namespace smt2 {
next();
check_identifier("invalid sort definition, symbol expected");
symbol id = curr_id();
if (m_ctx.find_psort_decl(id) != 0)
if (m_ctx.find_psort_decl(id) != nullptr)
throw parser_exception("invalid sort definition, sort already declared/defined");
next();
parse_sort_decl_params();
@ -2355,7 +2355,7 @@ namespace smt2 {
parse_expr();
if (m().get_sort(expr_stack().back()) != sort_stack().back())
throw parser_exception("invalid constant definition, sort mismatch");
m_ctx.insert(id, 0, 0, expr_stack().back());
m_ctx.insert(id, 0, nullptr, expr_stack().back());
check_rparen("invalid constant definition, ')' expected");
expr_stack().pop_back();
sort_stack().pop_back();
@ -2574,7 +2574,7 @@ namespace smt2 {
}
check_rparen("invalid get-value command, ')' expected");
if (!m_ctx.is_model_available() || m_ctx.get_check_sat_result() == 0)
if (!m_ctx.is_model_available() || m_ctx.get_check_sat_result() == nullptr)
throw cmd_exception("model is not available");
model_ref md;
if (index == 0) {
@ -2804,7 +2804,7 @@ namespace smt2 {
void parse_ext_cmd(int line, int pos) {
symbol s = curr_id();
m_curr_cmd = m_ctx.find_cmd(s);
if (m_curr_cmd == 0) {
if (m_curr_cmd == nullptr) {
parse_unknown_cmd();
return;
}
@ -2823,7 +2823,7 @@ namespace smt2 {
throw parser_exception("invalid command, argument(s) missing");
m_curr_cmd->execute(m_ctx);
next();
m_curr_cmd = 0;
m_curr_cmd = nullptr;
shrink(m_sort_stack, sort_spos);
shrink(m_expr_stack, expr_spos);
shrink(m_sexpr_stack, sexpr_spos);
@ -2923,12 +2923,12 @@ namespace smt2 {
}
public:
parser(cmd_context & ctx, std::istream & is, bool interactive, params_ref const & p, char const * filename=0):
parser(cmd_context & ctx, std::istream & is, bool interactive, params_ref const & p, char const * filename=nullptr):
m_ctx(ctx),
m_params(p),
m_scanner(ctx, is, interactive),
m_curr(scanner::NULL_TOKEN),
m_curr_cmd(0),
m_curr_cmd(nullptr),
m_num_bindings(0),
m_let("let"),
m_bang("!"),
@ -2988,23 +2988,23 @@ namespace smt2 {
void reset() {
reset_stack();
m_num_bindings = 0;
m_psort_stack = 0;
m_sort_stack = 0;
m_expr_stack = 0;
m_pattern_stack = 0;
m_nopattern_stack = 0;
m_sexpr_stack = 0;
m_psort_stack = nullptr;
m_sort_stack = nullptr;
m_expr_stack = nullptr;
m_pattern_stack = nullptr;
m_nopattern_stack = nullptr;
m_sexpr_stack = nullptr;
m_symbol_stack .reset();
m_param_stack .reset();
m_env .reset();
m_sort_id2param_idx .reset();
m_dt_name2idx .reset();
m_bv_util = 0;
m_arith_util = 0;
m_seq_util = 0;
m_pattern_validator = 0;
m_var_shifter = 0;
m_bv_util = nullptr;
m_arith_util = nullptr;
m_seq_util = nullptr;
m_pattern_validator = nullptr;
m_var_shifter = nullptr;
}
bool operator()() {

2
src/parsers/smt2/smt2parser.h
View file

@ -21,6 +21,6 @@ Revision History:
#include "cmd_context/cmd_context.h"
bool parse_smt2_commands(cmd_context & ctx, std::istream & is, bool interactive = false, params_ref const & p = params_ref(), char const * filename = 0);
bool parse_smt2_commands(cmd_context & ctx, std::istream & is, bool interactive = false, params_ref const & p = params_ref(), char const * filename = nullptr);
#endif

6
src/parsers/util/simple_parser.cpp
View file

@ -87,7 +87,7 @@ expr * simple_parser::parse_expr(scanner & s) {
}
throw parser_error();
case scanner::RIGHT_PAREN:
return 0;
return nullptr;
case scanner::ID_TOKEN:
if (m_builtin.find(s.get_id(), op)) {
expr * r = m_manager.mk_const(op.m_family_id, op.m_kind);
@ -123,7 +123,7 @@ bool simple_parser::parse(std::istream & in, expr_ref & result) {
return false;
}
m_exprs.reset();
return result.get() != 0;
return result.get() != nullptr;
}
bool simple_parser::parse_string(char const * str, expr_ref & result) {
@ -133,7 +133,7 @@ bool simple_parser::parse_string(char const * str, expr_ref & result) {
}
bool simple_parser::parse_file(char const * file, expr_ref & result) {
if (file != 0) {
if (file != nullptr) {
std::ifstream stream(file);
if (!stream) {
warning_msg("ERROR: could not open file '%s'.", file);