Replace asserts

Author: peterschrammel

src/goto-instrument/accelerate/trace_automaton.cpp

@@ -15,6 +15,8 @@ Author: Matt Lewis
 #include <iostream>
 #include <limits>
 
+#include <util/invariant.h>
+
 #include "path.h"
 
 const statet automatont::no_state=std::numeric_limits<statet>::max();
@@ -137,7 +139,9 @@ void trace_automatont::determinise()
   {
     state_sett t;
     pop_unmarked_dstate(t);
-    assert(find_dstate(t)!=automatont::no_state);
+    INVARIANT(
+      find_dstate(t)!=automatont::no_state,
+      "Removed state has actually been removed");
 
 
     // For each symbol a such that there is a transition
@@ -237,8 +241,9 @@ statet trace_automatont::add_dstate(state_sett &s)
   state_num=dta.add_state();
   dstates[s]=state_num;
   unmarked_dstates.push_back(s);
-
-  assert(dstates.find(s)!=dstates.end());
+  INVARIANT(
+    dstates.find(s)!=dstates.end(),
+    "Added state has actually been added");
 
   for(state_sett::iterator it=s.begin();
       it!=s.end();
@@ -290,7 +295,7 @@ statet automatont::add_state()
  */
 void automatont::add_trans(statet s, goto_programt::targett a, statet t)
 {
-  assert(s<transitions.size());
+  PRECONDITION(s<transitions.size());
   transitionst &trans=transitions[s];
 
   trans.insert(std::make_pair(a, t));
@@ -305,17 +310,17 @@ void trace_automatont::add_dtrans(
   state_sett &t)
 {
   statet sidx=find_dstate(s);
-  statet tidx=find_dstate(t);
+  CHECK_RETURN(sidx!=automatont::no_state);
 
-  assert(sidx!=automatont::no_state);
-  assert(tidx!=automatont::no_state);
+  statet tidx=find_dstate(t);
+  CHECK_RETURN(tidx!=automatont::no_state);
 
   dta.add_trans(sidx, a, tidx);
 }
 
 void automatont::move(statet s, goto_programt::targett a, state_sett &t)
 {
-  assert(s<transitions.size());
+  PRECONDITION(s<transitions.size());
 
   transitionst &trans=transitions[s];
 

src/util/string2int.cpp

@@ -11,7 +11,8 @@ Author: Michael Tautschnig, [email protected]
 #include <cerrno>
 #include <cstdlib>
 #include <limits>
-#include <cassert>
+
+#include "invariant.h"
 
 template <typename T>
 inline T str2number(const char *str, int base, bool safe)
@@ -28,22 +29,22 @@ inline T str2number(const char *str, int base, bool safe)
 
   if(safe)
   {
-    assert(0==errno);
+    CHECK_RETURN(0==errno);
     errno=errno_bak;
-    assert(endptr!=str);
+    CHECK_RETURN(endptr!=str);
     if(std::numeric_limits<T>::min()==0)
     {
       // unsigned
-      assert(val>=0);
-      assert(
+      CHECK_RETURN(val>=0);
+      CHECK_RETURN(
         (unsigned long long)(T)val<=
         (unsigned long long)std::numeric_limits<T>::max());
     }
     else
     {
       // signed
-      assert(val<=(long long)std::numeric_limits<T>::max());
-      assert(val>=(long long)std::numeric_limits<T>::min());
+      CHECK_RETURN(val<=(long long)std::numeric_limits<T>::max());
+      CHECK_RETURN(val>=(long long)std::numeric_limits<T>::min());
     }
   }