* Introduce the PLASSERT and PLASSERT_MSG macros in plerror.h

* Global search-and-replace of assert() to PLASSERT()

* Please use PLASSERT from now on.

Author: chapados

commands/PLearnCommands/HTMLHelpCommand.cc

@@ -146,7 +146,7 @@ void HTMLHelpCommand::copySnippet(ostream& os, const string& document)
 
 void HTMLHelpCommand::helpIndex()
 {
-    assert( config );
+    PLASSERT( config );
     ofstream os((config->output_dir + "/" + "index.html").c_str());
     helpIndex(os, config);
 }
@@ -178,7 +178,7 @@ void HTMLHelpCommand::helpIndex(ostream& os, const HTMLHelpConfig* config)
 
 void HTMLHelpCommand::helpCommands()
 {
-    assert( config );
+    PLASSERT( config );
     ofstream os((config->output_dir + "/" + "command_index.html").c_str());
     helpCommands(os, config);
 
@@ -226,7 +226,7 @@ void HTMLHelpCommand::helpCommands(ostream& os, const HTMLHelpConfig* config)
 
 void HTMLHelpCommand::helpOnCommand(const string& theCommand)
 {
-    assert( config );
+    PLASSERT( config );
     ofstream os((config->output_dir + "/" + "command_"+theCommand+".html").c_str());
     helpOnCommand(theCommand, os, config);
 }
@@ -260,7 +260,7 @@ void HTMLHelpCommand::helpOnCommand(const string& theCommand, ostream& os,
 
 void HTMLHelpCommand::helpClasses()
 {
-    assert( config );
+    PLASSERT( config );
     ofstream os((config->output_dir + "/" + "class_index.html").c_str());
     helpClasses(os, config);
 
@@ -307,7 +307,7 @@ void HTMLHelpCommand::helpClasses(ostream& os, const HTMLHelpConfig* config)
 
 void HTMLHelpCommand::helpOnClass(const string& classname)
 {
-    assert( config );
+    PLASSERT( config );
     ofstream out((config->output_dir + "/class_" + classname + ".html").c_str());
     helpOnClass(classname, out, config);
 }
@@ -463,7 +463,7 @@ void HTMLHelpCommand::helpOnClass(const string& classname, ostream& out,
         for ( ; it != end ; ++it ) {
             const string& method_name = it->first.first;
             const RemoteTrampoline* t = it->second;
-            assert( t );
+            PLASSERT( t );
             const RemoteMethodDoc& doc = t->documentation();
 
             // Generate the method signature and argument-list table in HTML form

commands/PLearnCommands/Plide.cc

@@ -71,7 +71,7 @@ class PlideProgressPlugin : public ProgressBarPlugin
     PlideProgressPlugin(PythonCodeSnippet* python)
         : m_python(python)
     {
-        assert( m_python );
+        PLASSERT( m_python );
     }
 
     //! Destructor releases all pending progress bars from GUI
@@ -97,7 +97,7 @@ class PlideProgressPlugin : public ProgressBarPlugin
 
 PlideProgressPlugin::~PlideProgressPlugin()
 {
-    assert( m_python );
+    PLASSERT( m_python );
     for (map<ProgressBar*, int>::const_iterator it = m_progress_ids.begin(),
              end = m_progress_ids.end() ; it != end ; ++it)
     {
@@ -109,7 +109,7 @@ PlideProgressPlugin::~PlideProgressPlugin()
 
 void PlideProgressPlugin::addProgressBar(ProgressBar* pb)
 {
-    assert( pb && m_python );
+    PLASSERT( pb && m_python );
     if (m_progress_ids.find(pb) == m_progress_ids.end()) {
         m_progress_ids[pb] =
             m_python->invoke("AllocateProgressBar", pb->title).as<int>();
@@ -118,7 +118,7 @@ void PlideProgressPlugin::addProgressBar(ProgressBar* pb)
 
 void PlideProgressPlugin::killProgressBar(ProgressBar* pb)
 {
-    assert( pb && m_python );
+    PLASSERT( pb && m_python );
     map<ProgressBar*, int>::iterator found = m_progress_ids.find(pb);
     if (found != m_progress_ids.end()) {
         m_python->invoke("ReleaseProgressBar", int(found->second));
@@ -128,7 +128,7 @@ void PlideProgressPlugin::killProgressBar(ProgressBar* pb)
 
 void PlideProgressPlugin::update(ProgressBar* pb, unsigned long newpos)
 {
-    assert( pb && m_python );
+    PLASSERT( pb && m_python );
     map<ProgressBar*, int>::const_iterator found = m_progress_ids.find(pb);
     if (found != m_progress_ids.end()) {
         int progress_id = found->second;
@@ -175,7 +175,7 @@ void PlideLogPStreamBuf::outputParameters(const string& module_name, int request
 
 void PlideLogPStreamBuf::flush()
 {
-    assert( st && m_python );
+    PLASSERT( st && m_python );
     inherited::flush();
     if (! st->empty()) {
         m_python->invoke("LogAppend", m_module_name, m_requested_verbosity, *st);
@@ -208,7 +208,7 @@ class PlideLogPlugin : public PL_LogPlugin
 PStream& PlideLogPlugin::getStream(PStream::mode_t outmode, const string& module_name,
                                    int requested_verbosity)
 {
-    assert( m_streambuf );
+    PLASSERT( m_streambuf );
     m_pstream.setOutMode(outmode);
     m_streambuf->outputParameters(module_name, requested_verbosity);
     m_streambuf->flush();
@@ -375,7 +375,7 @@ PythonObjectWrapper Plide::helpIndex(const TVec<PythonObjectWrapper>& args) cons
     if (args.size() != 0)
         PLERROR("%sExpecting 0 argument; got %d", __FUNCTION__, args.size());
 
-    assert( m_help_config && m_help_command );
+    PLASSERT( m_help_config && m_help_command );
     ostringstream os;
     m_help_command->helpIndex(os, m_help_config);
     return os.str();
@@ -386,7 +386,7 @@ PythonObjectWrapper Plide::helpCommands(const TVec<PythonObjectWrapper>& args) c
     if (args.size() != 0)
         PLERROR("%sExpecting 0 argument; got %d", __FUNCTION__, args.size());
 
-    assert( m_help_config && m_help_command );
+    PLASSERT( m_help_config && m_help_command );
     ostringstream os;
     m_help_command->helpCommands(os, m_help_config);
     return os.str();
@@ -397,7 +397,7 @@ PythonObjectWrapper Plide::helpClasses(const TVec<PythonObjectWrapper>& args) co
     if (args.size() != 0)
         PLERROR("%sExpecting 0 argument; got %d", __FUNCTION__, args.size());
 
-    assert( m_help_config && m_help_command );
+    PLASSERT( m_help_config && m_help_command );
     ostringstream os;
     m_help_command->helpClasses(os, m_help_config);
     return os.str();
@@ -408,7 +408,7 @@ PythonObjectWrapper Plide::helpOnCommand(const TVec<PythonObjectWrapper>& args)
     if (args.size() != 1)
         PLERROR("%sExpecting 1 argument; got %d", __FUNCTION__, args.size());
 
-    assert( m_help_config && m_help_command );
+    PLASSERT( m_help_config && m_help_command );
     ostringstream os;
     m_help_command->helpOnCommand(args[0].as<string>(), os, m_help_config);
     return os.str();
@@ -419,7 +419,7 @@ PythonObjectWrapper Plide::helpOnClass(const TVec<PythonObjectWrapper>& args) co
     if (args.size() != 1)
         PLERROR("%sExpecting 1 argument; got %d", __FUNCTION__, args.size());
 
-    assert( m_help_config && m_help_command );
+    PLASSERT( m_help_config && m_help_command );
     ostringstream os;
     m_help_command->helpOnClass(args[0].as<string>(), os, m_help_config);
     return os.str();
@@ -473,7 +473,7 @@ void Plide::executePyPLearn(const string& script_code, const string& root_dir) c
     PStream pyplearn_in = openString(script_code, PStream::plearn_ascii);
     PP<PyPLearnScript> pyplearn_script = new PyPLearnScript;
     pyplearn_in >> pyplearn_script;
-    assert( pyplearn_script );
+    PLASSERT( pyplearn_script );
 
     PStream plearn_in = openString(pyplearn_script->getScript(),
                                    PStream::plearn_ascii);

plearn/base/ObjectGraphIterator.cc

@@ -72,7 +72,7 @@ ObjectOptionsIterator::ObjectOptionsIterator(const Object* root,
 {
     if (m_object) {
         m_options = &m_object->getOptionList();
-        assert( m_options );
+        PLASSERT( m_options );
 
         if (m_options->size() > 0) {
             m_invalid = false;
@@ -97,7 +97,7 @@ bool ObjectOptionsIterator::operator==(const ObjectOptionsIterator& rhs) const
 
 const Object* ObjectOptionsIterator::operator*() const
 {
-    assert( !m_invalid && m_object && m_options );
+    PLASSERT( !m_invalid && m_object && m_options );
 
     if (m_max_index > 0)
         return (*m_options)[m_cur_option]->getIndexedObject(m_object,
@@ -109,7 +109,7 @@ const Object* ObjectOptionsIterator::operator*() const
 
 string ObjectOptionsIterator::getCurrentOptionName() const
 {
-    assert( !m_invalid && m_object && m_options );
+    PLASSERT( !m_invalid && m_object && m_options );
     string optionname = (*m_options)[m_cur_option]->optionname();
     if (m_max_index > 0)
         optionname += '[' + tostring(m_cur_index) + ']';
@@ -119,20 +119,20 @@ string ObjectOptionsIterator::getCurrentOptionName() const
 
 OptionBase::flag_t ObjectOptionsIterator::getCurrentOptionFlags() const
 {
-    assert( !m_invalid && m_object && m_options );
+    PLASSERT( !m_invalid && m_object && m_options );
     return (*m_options)[m_cur_option]->flags();
 }
 
 
 const ObjectOptionsIterator& ObjectOptionsIterator::operator++()
 {
-    assert( !m_invalid && m_object && m_options );
+    PLASSERT( !m_invalid && m_object && m_options );
 
     do {
         // Start by considering current iteration within an indexable option
         if (m_max_index > 0) {
             ++m_cur_index;
-            assert( m_cur_index <= m_max_index );
+            PLASSERT( m_cur_index <= m_max_index );
             if (m_cur_index < m_max_index)
                 return *this;
         }
@@ -210,7 +210,7 @@ bool ObjectGraphIterator::operator==(const ObjectGraphIterator& rhs) const
 
 const ObjectGraphIterator& ObjectGraphIterator::operator++()
 {
-    assert( !invalid() );
+    PLASSERT( !invalid() );
     for ( ++m_it ; m_it != m_end && m_isa_tester && !m_isa_tester(**this) ; ++m_it )
         continue;
     return *this;

plearn/base/ObjectGraphIterator.h

@@ -235,7 +235,7 @@ class ObjectGraphIterator
     //! returns a null pointer.
     const Object* operator*() const
     {
-        assert( !invalid() );
+        PLASSERT( !invalid() );
         return m_it->first;
     }
 
@@ -245,7 +245,7 @@ class ObjectGraphIterator
     //! constructed with the option compute_optnames set to 'false'.
     const string& getCurrentOptionName() const
     {
-        assert( !invalid() );
+        PLASSERT( !invalid() );
         return m_it->second;
     }
 

plearn/base/Option.h

@@ -143,7 +143,7 @@ class Option : public OptionBase
     virtual int indexableSize(const Object* o) const
     {
         const ObjectType* oto = dynamic_cast<const ObjectType*>(o);
-        assert( oto );
+        PLASSERT( oto );
         return indexableObjectSize(oto->*ptr);
     }
 

plearn/base/PDate.cc

@@ -57,7 +57,7 @@ using namespace std;
 PDate PDate::lastDateOfMonth(int year, int month)
 {
     PDate date = PDate(year, month, int(lastDayOfMonth(year, month)));
-    assert( date.isValid() );
+    PLASSERT( date.isValid() );
     return date;
 }
 
@@ -109,7 +109,7 @@ PDate::PDate(int julian_day)
     day = jb - jd - jf;
     month = (je>13) ? je-13 : je-1;
     year = (month>2) ? jc-4716 : jc-4715;
-    assert( isValid() );
+    PLASSERT( isValid() );
 }
 
 PDate::PDate(string date)

plearn/base/PDateTime.cc

@@ -152,7 +152,7 @@ void PDateTime::incHour(int hour_inc)
 ////////////
 void PDateTime::incDay(int day_inc)
 {
-    assert( day_inc >= 0 );
+    PLASSERT( day_inc >= 0 );
     int new_day = int(day) + day_inc;
     int max_day = 31;
     if (month == 2) {
@@ -167,7 +167,7 @@ void PDateTime::incDay(int day_inc)
         return;
     }
     // We need to switch to next month.
-    assert( max_day >= int(day) );
+    PLASSERT( max_day >= int(day) );
     int days_to_next_month = max_day - int(day) + 1;
     month++;
     if (month == 13) {

plearn/base/PLearnDiff.cc

@@ -99,15 +99,15 @@ void PLearnDiff::build()
 ///////////////////
 void PLearnDiff::addDiffPrefix(const string& prefix, int n)
 {
-    assert( n >= 0 && n <= diffs.length() );
+    PLASSERT( n >= 0 && n <= diffs.length() );
     int l = diffs.length() - 1;
     for (int j = 0; j < n; j++)
         diffs(l - j, 0) = prefix + diffs(l - j, 0);
 }
 
 void addDiffPrefix(PLearnDiff* diffs, const string& prefix, int n)
 {
-    assert( diffs );
+    PLASSERT( diffs );
     diffs->addDiffPrefix(prefix, n);
 }
 
@@ -132,7 +132,7 @@ int PLearnDiff::diff(const string& refer, const string& other, const string& nam
 
 int diff(PLearnDiff* diffs, const string& refer, const string& other, const string& name)
 {
-    assert( diffs );
+    PLASSERT( diffs );
     return diffs->diff(refer, other, name);
 }
 
@@ -149,7 +149,7 @@ void PLearnDiff::forget()
 ////////////////////////////
 real get_absolute_tolerance(PLearnDiff* diffs)
 {
-    assert( diffs );
+    PLASSERT( diffs );
     return diffs->absolute_tolerance;
 }
 
@@ -158,7 +158,7 @@ real get_absolute_tolerance(PLearnDiff* diffs)
 ////////////////////////////
 real get_relative_tolerance(PLearnDiff* diffs)
 {
-    assert( diffs );
+    PLASSERT( diffs );
     return diffs->relative_tolerance;
 }
 

plearn/base/PMemPool.cc

@@ -84,7 +84,7 @@ void PMemArena::deallocate(void* p)
         watermark += object_size;
     else {
         // Otherwise, add p to free_list
-        assert( belongsToArena(p) );
+        PLASSERT( belongsToArena(p) );
         void** new_free_head = static_cast<void**>(p);
         *new_free_head = free_list;
         free_list = new_free_head;
@@ -150,20 +150,20 @@ void PMemPool::deallocate(void* p)
         else {
             // Find arena from map
             map<void*,PMemArena*>::iterator arena_it = stormap.upper_bound(p);
-            assert( arena_it != stormap.begin() );
+            PLASSERT( arena_it != stormap.begin() );
             --arena_it;
             PMemArena* arena = arena_it->second;
-            assert( arena && arena->belongsToArena(p));
+            PLASSERT( arena && arena->belongsToArena(p));
             arena->deallocate(p);
             last_arena = arena;
         }
 
         // Check to see if arena should be eliminated
         if (last_arena && last_arena->empty()) {
             map<void*,PMemArena*>::iterator arena_it = stormap.upper_bound(p);
-            assert( arena_it != stormap.begin() );
+            PLASSERT( arena_it != stormap.begin() );
             --arena_it;
-            assert( last_arena == arena_it->second );
+            PLASSERT( last_arena == arena_it->second );
             stormap.erase(arena_it);
             arenas.remove(last_arena);
             last_arena = 0;

plearn/base/ParentableObject.cc

@@ -180,7 +180,7 @@ void ParentableObject::setParent(Object* parent)
 
 void ParentableObject::checkParent() const
 {
-    assert( m_parent );
+    PLASSERT( m_parent );
 }