Raise explicit IndexError from extension module.

Do not rely on boost python translator of C++ exceptions.
This fixes incorrect exceptions when pyobjcryst is imported as well.
Also raise NotImplementedError for unknown enum values in the wrapper.
Use abort() to assert unreachable code and avoid no-return-value
compiler warnings.

Author: pavoljuhas

srrealmodule/srreal_converters.cpp

@@ -25,6 +25,7 @@
 #include <valarray>
 #include <stdexcept>
 #include <cassert>
+#include <cstdlib>
 
 #include <diffpy/Attributes.hpp>
 #include <diffpy/srreal/StructureAdapter.hpp>
@@ -276,7 +277,7 @@ NumPyArray_DoublePtr extractNumPyDoubleArray(::boost::python::object& obj)
         const char* emsg = "Cannot convert this object to numpy array.";
         PyErr_SetString(PyExc_TypeError, emsg);
         boost::python::throw_error_already_set();
-        assert(false);
+        abort();
     }
     boost::python::object rvobj((boost::python::handle<>(arr)));
     double* rvdata = static_cast<double*>(PyArray_DATA(arr));

srrealmodule/wrap_ObjCrystAdapters.cpp

@@ -19,6 +19,8 @@
 
 #include <boost/python/def.hpp>
 
+#include <cstdlib>
+
 #include <diffpy/features.hpp>
 #include <diffpy/srreal/StructureAdapter.hpp>
 
@@ -82,8 +84,7 @@ StructureAdapterPtr convertObjCrystMolecule(python::object mol)
     std::string emsg = "ObjCryst support not available.";
     PyErr_SetString(PyExc_TypeError, emsg.c_str());
     boost::python::throw_error_already_set();
-    assert(false);
-    return StructureAdapterPtr();
+    abort();
 }
 
 StructureAdapterPtr convertObjCrystCrystal(python::object cryst)

srrealmodule/wrap_PairQuantity.cpp

@@ -35,6 +35,8 @@
 #include <boost/python/copy_non_const_reference.hpp>
 #include <boost/python/return_internal_reference.hpp>
 
+#include <cstdlib>
+
 #include "srreal_converters.hpp"
 #include "srreal_pickling.hpp"
 
@@ -357,8 +359,10 @@ std::string stringevaluatortype(PQEvaluatorType tp)
         case OPTIMIZED:
             return evtp_OPTIMIZED;
     }
-    std::string emsg = "Unknown internal value of PQEvaluatorType.";
-    throw std::out_of_range(emsg);
+    const char* emsg = "Unknown internal value of PQEvaluatorType.";
+    PyErr_SetString(PyExc_NotImplementedError, emsg);
+    throw_error_already_set();
+    abort();
 }
 
 

srrealmodule/wrap_StructureAdapter.cpp

@@ -464,7 +464,8 @@ void checkindex(const StructureAdapter& adpt, int i)
     if (dynamic_cast<const StructureAdapterWrap*>(&adpt))  return;
     // Prevent out-of-bounds crash from C++ objects.
     if (0 <= i && i < adpt.countSites())  return;
-    throw std::out_of_range("Index out of range.");
+    PyErr_SetString(PyExc_IndexError, "Index out of range.");
+    throw_error_already_set();
 }
 
 }   // namespace

srrealmodule/wrap_StructureDifference.cpp

@@ -20,6 +20,8 @@
 #include <boost/python/class.hpp>
 #include <boost/python/slice.hpp>
 
+#include <cstdlib>
+
 #include <diffpy/srreal/StructureAdapter.hpp>
 #include <diffpy/srreal/StructureDifference.hpp>
 
@@ -123,8 +125,10 @@ std::string get_diffmethod(const StructureDifference& sd)
         case StructureDifference::Method::SORTED:
             return "SORTED";
     }
-    std::string emsg = "Unknown internal value of StructureDifference::Method.";
-    throw std::out_of_range(emsg);
+    const char* emsg = "Unknown internal value of StructureDifference::Method.";
+    PyErr_SetString(PyExc_NotImplementedError, emsg);
+    boost::python::throw_error_already_set();
+    abort();
 }