Skip to content

Commit a06cf76

Browse files
committed
Fix nullptr
1 parent 4577401 commit a06cf76

File tree

80 files changed

+296
-296
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

80 files changed

+296
-296
lines changed

src/analyses/goto_check.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ class goto_checkt
3737
const namespacet &_ns,
3838
const optionst &_options):
3939
ns(_ns),
40-
local_bitvector_analysis(0)
40+
local_bitvector_analysis(nullptr)
4141
{
4242
enable_bounds_check=_options.get_bool_option("bounds-check");
4343
enable_pointer_check=_options.get_bool_option("pointer-check");

src/analyses/goto_rw.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -463,9 +463,9 @@ void rw_range_sett::add(
463463
{
464464
objectst::iterator entry=(mode==get_modet::LHS_W ? w_range_set : r_range_set).
465465
insert(
466-
std::pair<const irep_idt&, range_domain_baset*>(identifier, 0)).first;
466+
std::pair<const irep_idt&, range_domain_baset*>(identifier, nullptr)).first;
467467

468-
if(entry->second==0)
468+
if(entry->second==nullptr)
469469
entry->second=new range_domaint();
470470

471471
static_cast<range_domaint*>(entry->second)->push_back(
@@ -663,9 +663,9 @@ void rw_guarded_range_set_value_sett::add(
663663
{
664664
objectst::iterator entry=(mode==get_modet::LHS_W ? w_range_set : r_range_set).
665665
insert(
666-
std::pair<const irep_idt&, range_domain_baset*>(identifier, 0)).first;
666+
std::pair<const irep_idt&, range_domain_baset*>(identifier, nullptr)).first;
667667

668-
if(entry->second==0)
668+
if(entry->second==nullptr)
669669
entry->second=new guarded_range_domaint();
670670

671671
static_cast<guarded_range_domaint*>(entry->second)->insert(

src/analyses/goto_rw.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ class rw_range_sett
108108

109109
const range_domaint &get_ranges(objectst::const_iterator it) const
110110
{
111-
assert(dynamic_cast<range_domaint*>(it->second)!=0);
111+
assert(dynamic_cast<range_domaint*>(it->second)!=nullptr);
112112
return *static_cast<range_domaint*>(it->second);
113113
}
114114

@@ -277,7 +277,7 @@ class rw_guarded_range_set_value_sett:public rw_range_set_value_sett
277277

278278
const guarded_range_domaint &get_ranges(objectst::const_iterator it) const
279279
{
280-
assert(dynamic_cast<guarded_range_domaint*>(it->second)!=0);
280+
assert(dynamic_cast<guarded_range_domaint*>(it->second)!=nullptr);
281281
return *static_cast<guarded_range_domaint*>(it->second);
282282
}
283283

src/analyses/invariant_set.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ bool invariant_sett::get_object(
144144
const exprt &expr,
145145
unsigned &n) const
146146
{
147-
assert(object_store!=NULL);
147+
assert(object_store!=nullptr);
148148
return object_store->get(expr, n);
149149
}
150150

@@ -315,7 +315,7 @@ void invariant_sett::output(
315315
return;
316316
}
317317

318-
assert(object_store!=NULL);
318+
assert(object_store!=nullptr);
319319

320320
for(unsigned i=0; i<eq_set.size(); i++)
321321
if(eq_set.is_root(i) &&
@@ -899,7 +899,7 @@ std::string invariant_sett::to_string(
899899
unsigned a,
900900
const irep_idt &identifier) const
901901
{
902-
assert(object_store!=NULL);
902+
assert(object_store!=nullptr);
903903
return object_store->to_string(a, identifier);
904904
}
905905

src/analyses/invariant_set.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -98,9 +98,9 @@ class invariant_sett
9898
invariant_sett():
9999
threaded(false),
100100
is_false(false),
101-
value_sets(NULL),
102-
object_store(NULL),
103-
ns(NULL)
101+
value_sets(nullptr),
102+
object_store(nullptr),
103+
ns(nullptr)
104104
{
105105
}
106106

src/analyses/local_may_alias.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ class local_may_aliast
9494
class local_may_alias_factoryt
9595
{
9696
public:
97-
local_may_alias_factoryt():goto_functions(NULL)
97+
local_may_alias_factoryt():goto_functions(nullptr)
9898
{
9999
}
100100

@@ -109,7 +109,7 @@ class local_may_alias_factoryt
109109

110110
local_may_aliast &operator()(const irep_idt &fkt)
111111
{
112-
assert(goto_functions!=NULL);
112+
assert(goto_functions!=nullptr);
113113
fkt_mapt::iterator f_it=fkt_map.find(fkt);
114114
if(f_it!=fkt_map.end())
115115
return *f_it->second;

src/analyses/reaching_definitions.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ void rd_range_domaint::transform(
5151
{
5252
reaching_definitions_analysist *rd=
5353
dynamic_cast<reaching_definitions_analysist*>(&ai);
54-
assert(rd!=0);
54+
assert(rd!=nullptr);
5555

5656
assert(bv_container);
5757

@@ -298,7 +298,7 @@ void rd_range_domaint::transform_assign(
298298
const symbolt *symbol_ptr;
299299
if(ns.lookup(identifier, symbol_ptr))
300300
continue;
301-
assert(symbol_ptr!=0);
301+
assert(symbol_ptr!=nullptr);
302302

303303
const range_domaint &ranges=rw_set.get_ranges(it);
304304

src/analyses/reaching_definitions.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ class rd_range_domaint:public ai_domain_baset
102102
rd_range_domaint():
103103
ai_domain_baset(),
104104
has_values(false),
105-
bv_container(0)
105+
bv_container(nullptr)
106106
{
107107
}
108108

@@ -243,9 +243,9 @@ class reaching_definitions_analysist:
243243
explicit reaching_definitions_analysist(const namespacet &_ns):
244244
concurrency_aware_ait<rd_range_domaint>(),
245245
ns(_ns),
246-
value_sets(0),
247-
is_threaded(0),
248-
is_dirty(0)
246+
value_sets(nullptr),
247+
is_threaded(nullptr),
248+
is_dirty(nullptr)
249249
{
250250
}
251251

@@ -259,7 +259,7 @@ class reaching_definitions_analysist:
259259
statet &s=concurrency_aware_ait<rd_range_domaint>::get_state(l);
260260

261261
rd_range_domaint *rd_state=dynamic_cast<rd_range_domaint*>(&s);
262-
assert(rd_state!=0);
262+
assert(rd_state!=nullptr);
263263

264264
rd_state->set_bitvector_container(*this);
265265

src/ansi-c/c_preprocess.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -344,7 +344,7 @@ bool c_preprocess(
344344
static bool is_dot_i_file(const std::string &path)
345345
{
346346
const char *ext=strrchr(path.c_str(), '.');
347-
if(ext==NULL)
347+
if(ext==nullptr)
348348
return false;
349349
if(std::string(ext)==".i" ||
350350
std::string(ext)==".ii")
@@ -889,7 +889,7 @@ bool c_preprocess_gcc_clang(
889889

890890
FILE *stream=popen(command.c_str(), "r");
891891

892-
if(stream!=NULL)
892+
if(stream!=nullptr)
893893
{
894894
int ch;
895895
while((ch=fgetc(stream))!=EOF)
@@ -1011,7 +1011,7 @@ bool c_preprocess_arm(
10111011

10121012
FILE *stream=popen(command.c_str(), "r");
10131013

1014-
if(stream!=NULL)
1014+
if(stream!=nullptr)
10151015
{
10161016
int ch;
10171017
while((ch=fgetc(stream))!=EOF)

src/ansi-c/cprover_library.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ std::string get_cprover_library_text(
3838
std::size_t count=0;
3939

4040
for(cprover_library_entryt *e=cprover_library;
41-
e->function!=NULL;
41+
e->function!=nullptr;
4242
e++)
4343
{
4444
irep_idt id=e->function;

0 commit comments

Comments
 (0)