Merge pull request #1172 from diffblue/revert-1159-use-nullptr-master

Revert "[depends: #1063] Use nullptr to represent null pointers (targets master)"

Author: tautschnig

src/analyses/goto_check.cpp

@@ -37,7 +37,7 @@ class goto_checkt
     const namespacet &_ns,
     const optionst &_options):
     ns(_ns),
-    local_bitvector_analysis(nullptr)
+    local_bitvector_analysis(0)
   {
     enable_bounds_check=_options.get_bool_option("bounds-check");
     enable_pointer_check=_options.get_bool_option("pointer-check");

src/analyses/goto_rw.cpp

@@ -463,10 +463,9 @@ void rw_range_sett::add(
 {
   objectst::iterator entry=(mode==get_modet::LHS_W ? w_range_set : r_range_set).
     insert(
-      std::pair<const irep_idt&, range_domain_baset*>(
-        identifier, nullptr)).first;
+      std::pair<const irep_idt&, range_domain_baset*>(identifier, 0)).first;
 
-  if(entry->second==nullptr)
+  if(entry->second==0)
     entry->second=new range_domaint();
 
   static_cast<range_domaint*>(entry->second)->push_back(
@@ -664,10 +663,9 @@ void rw_guarded_range_set_value_sett::add(
 {
   objectst::iterator entry=(mode==get_modet::LHS_W ? w_range_set : r_range_set).
     insert(
-      std::pair<const irep_idt&, range_domain_baset*>(
-        identifier, nullptr)).first;
+      std::pair<const irep_idt&, range_domain_baset*>(identifier, 0)).first;
 
-  if(entry->second==nullptr)
+  if(entry->second==0)
     entry->second=new guarded_range_domaint();
 
   static_cast<guarded_range_domaint*>(entry->second)->insert(

src/analyses/goto_rw.h

@@ -108,7 +108,7 @@ class rw_range_sett
 
   const range_domaint &get_ranges(objectst::const_iterator it) const
   {
-    PRECONDITION(dynamic_cast<range_domaint*>(it->second)!=nullptr);
+    assert(dynamic_cast<range_domaint*>(it->second)!=0);
     return *static_cast<range_domaint*>(it->second);
   }
 
@@ -277,7 +277,7 @@ class rw_guarded_range_set_value_sett:public rw_range_set_value_sett
 
   const guarded_range_domaint &get_ranges(objectst::const_iterator it) const
   {
-    PRECONDITION(dynamic_cast<guarded_range_domaint*>(it->second)!=nullptr);
+    assert(dynamic_cast<guarded_range_domaint*>(it->second)!=0);
     return *static_cast<guarded_range_domaint*>(it->second);
   }
 

src/analyses/invariant_set.cpp

@@ -144,7 +144,7 @@ bool invariant_sett::get_object(
   const exprt &expr,
   unsigned &n) const
 {
-  PRECONDITION(object_store!=nullptr);
+  assert(object_store!=NULL);
   return object_store->get(expr, n);
 }
 
@@ -315,8 +315,7 @@ void invariant_sett::output(
     return;
   }
 
-  INVARIANT(
-    object_store!=nullptr, nullptr_exceptiont("Object store is null"));
+  assert(object_store!=NULL);
 
   for(unsigned i=0; i<eq_set.size(); i++)
     if(eq_set.is_root(i) &&
@@ -900,7 +899,7 @@ std::string invariant_sett::to_string(
   unsigned a,
   const irep_idt &identifier) const
 {
-  PRECONDITION(object_store!=nullptr);
+  assert(object_store!=NULL);
   return object_store->to_string(a, identifier);
 }
 

src/analyses/invariant_set.h

@@ -22,8 +22,6 @@ Author: Daniel Kroening, [email protected]
 
 #include "interval_template.h"
 
-#define nullptr_exceptiont(str) str
-
 class inv_object_storet
 {
 public:
@@ -100,9 +98,9 @@ class invariant_sett
   invariant_sett():
     threaded(false),
     is_false(false),
-    value_sets(nullptr),
-    object_store(nullptr),
-    ns(nullptr)
+    value_sets(NULL),
+    object_store(NULL),
+    ns(NULL)
   {
   }
 

src/analyses/local_may_alias.h

@@ -94,7 +94,7 @@ class local_may_aliast
 class local_may_alias_factoryt
 {
 public:
-  local_may_alias_factoryt():goto_functions(nullptr)
+  local_may_alias_factoryt():goto_functions(NULL)
   {
   }
 
@@ -109,7 +109,7 @@ class local_may_alias_factoryt
 
   local_may_aliast &operator()(const irep_idt &fkt)
   {
-    PRECONDITION(goto_functions!=nullptr);
+    assert(goto_functions!=NULL);
     fkt_mapt::iterator f_it=fkt_map.find(fkt);
     if(f_it!=fkt_map.end())
       return *f_it->second;

src/analyses/reaching_definitions.cpp

@@ -51,9 +51,7 @@ void rd_range_domaint::transform(
 {
   reaching_definitions_analysist *rd=
     dynamic_cast<reaching_definitions_analysist*>(&ai);
-  INVARIANT(
-    rd!=nullptr,
-    bad_cast_exceptiont("ai has type reaching_definitions_analysist"));
+  assert(rd!=0);
 
   assert(bv_container);
 
@@ -300,9 +298,7 @@ void rd_range_domaint::transform_assign(
     const symbolt *symbol_ptr;
     if(ns.lookup(identifier, symbol_ptr))
       continue;
-    INVARIANT(
-      symbol_ptr!=nullptr,
-      nullptr_exceptiont("Symbol is in symbol table"));
+    assert(symbol_ptr!=0);
 
     const range_domaint &ranges=rw_set.get_ranges(it);
 

src/analyses/reaching_definitions.h

@@ -26,9 +26,6 @@ class is_threadedt;
 class dirtyt;
 class reaching_definitions_analysist;
 
-#define bad_cast_exceptiont(str) str
-#define nullptr_exceptiont(str) str
-
 // requirement: V has a member "identifier" of type irep_idt
 template<typename V>
 class sparse_bitvector_analysist
@@ -105,7 +102,7 @@ class rd_range_domaint:public ai_domain_baset
   rd_range_domaint():
     ai_domain_baset(),
     has_values(false),
-    bv_container(nullptr)
+    bv_container(0)
   {
   }
 
@@ -246,9 +243,9 @@ class reaching_definitions_analysist:
   explicit reaching_definitions_analysist(const namespacet &_ns):
     concurrency_aware_ait<rd_range_domaint>(),
     ns(_ns),
-    value_sets(nullptr),
-    is_threaded(nullptr),
-    is_dirty(nullptr)
+    value_sets(0),
+    is_threaded(0),
+    is_dirty(0)
   {
   }
 
@@ -262,9 +259,7 @@ class reaching_definitions_analysist:
     statet &s=concurrency_aware_ait<rd_range_domaint>::get_state(l);
 
     rd_range_domaint *rd_state=dynamic_cast<rd_range_domaint*>(&s);
-    INVARIANT(
-      rd_state!=nullptr,
-      bad_cast_exceptiont("rd_state has type rd_range_domaint"));
+    assert(rd_state!=0);
 
     rd_state->set_bitvector_container(*this);
 

src/ansi-c/c_preprocess.cpp

@@ -344,7 +344,7 @@ bool c_preprocess(
 static bool is_dot_i_file(const std::string &path)
 {
   const char *ext=strrchr(path.c_str(), '.');
-  if(ext==nullptr)
+  if(ext==NULL)
     return false;
   if(std::string(ext)==".i" ||
      std::string(ext)==".ii")
@@ -889,7 +889,7 @@ bool c_preprocess_gcc_clang(
 
   FILE *stream=popen(command.c_str(), "r");
 
-  if(stream!=nullptr)
+  if(stream!=NULL)
   {
     int ch;
     while((ch=fgetc(stream))!=EOF)
@@ -1011,7 +1011,7 @@ bool c_preprocess_arm(
 
   FILE *stream=popen(command.c_str(), "r");
 
-  if(stream!=nullptr)
+  if(stream!=NULL)
   {
     int ch;
     while((ch=fgetc(stream))!=EOF)

src/ansi-c/cprover_library.cpp

@@ -38,7 +38,7 @@ std::string get_cprover_library_text(
   std::size_t count=0;
 
   for(cprover_library_entryt *e=cprover_library;
-      e->function!=nullptr;
+      e->function!=NULL;
       e++)
   {
     irep_idt id=e->function;