comparison PyPlugin.cpp @ 71:40a01bb24209 vampyhost

Pull apart some type conversion classes for possible use in VamPy Host

 	else DSTREAM << "Debug messages OFF for Vampy plugin: " << m_class << endl;
 	
 	if (m_debugFlag && m_quitOnErrorFlag) cerr << "Quit on type error ON for: " << m_class << endl;
    
 	if (m_debugFlag && st_flag) cerr << "Strict type conversion ON for: " << m_class << endl;
+
 	m_ti.setStrictTypingFlag(st_flag);
+	m_tc.setStrictTypingFlag(st_flag);
+
 	m_ti.setNumpyInstalled(m_numpyInstalled);
+	m_tc.setNumpyInstalled(m_numpyInstalled);
 
 }
 
 PyPlugin::~PyPlugin()
 {

 		PyObject *pyValue = PyObject_GetAttrString(m_pyInstance,flagName);
 		if (!pyValue) 
 		{
 			if (PyErr_Occurred()) {PyErr_Print(); PyErr_Clear();}
 		} else {
-			rValue = m_ti.PyValue_To_Bool(pyValue);
-			if (m_ti.error) { 
+			rValue = m_tc.PyValue_To_Bool(pyValue);
+			if (m_tc.error) { 
 				Py_CLEAR(pyValue);
 				typeErrorHandler(flagName);
 				rValue = defValue;
 			} else Py_DECREF(pyValue);
 		}

 		PyObject *pyValue = PyObject_GetAttrString(m_pyInstance,flagName);
 		if (!pyValue) 
 		{
 			if (PyErr_Occurred()) {PyErr_Print(); PyErr_Clear();}
 		} else {
-			rValue |= (int) m_ti.PyValue_To_Size_t(pyValue);
-			if (m_ti.error) { 
+			rValue |= (int) m_tc.PyValue_To_Size_t(pyValue);
+			if (m_tc.error) { 
 				Py_CLEAR(pyValue);
 				typeErrorHandler(flagName);
 				rValue = defValue;
 			} else Py_DECREF(pyValue);
 		}

 
 void
 PyPlugin::typeErrorHandler(const char *method, bool process) const
 {
 	bool strict = false;
-	while (m_ti.error) { 
-		PyTypeInterface::ValueError e = m_ti.getError();
+	while (m_tc.error || m_ti.error) {
+	    ValueError e;
+	    if (m_tc.error) e = m_tc.getError();
+	    else e = m_ti.getError();
 #ifdef HAVE_NUMPY
 		// disable the process completely if numpy types are returned 
 		// but a compatible version was not loaded.
 		// This is required because if an object is returned from
 		// the wrong build, malloc complains about its size