__DIRECTOR__ renamed Swig::Director
SWIG_DIRECTOR_EXCEPTION renamed Swig::DirectorException (similarly for derived classes) git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@5138 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
William S Fulton
parent
69d79e0674
commit
f569dd135d
20 changed files with 507 additions and 496 deletions
|
|
@ -13,160 +13,166 @@
|
|||
|
||||
#include <string>
|
||||
|
||||
struct swig_body_args
|
||||
{
|
||||
VALUE recv;
|
||||
ID id;
|
||||
int argc;
|
||||
VALUE *argv;
|
||||
};
|
||||
namespace Swig {
|
||||
struct body_args {
|
||||
VALUE recv;
|
||||
ID id;
|
||||
int argc;
|
||||
VALUE *argv;
|
||||
};
|
||||
|
||||
/* Base class for director exceptions */
|
||||
class SWIG_DIRECTOR_EXCEPTION {
|
||||
protected:
|
||||
VALUE _error;
|
||||
protected:
|
||||
SWIG_DIRECTOR_EXCEPTION(VALUE error=Qnil) : _error(error) {}
|
||||
public:
|
||||
VALUE getType() const { return CLASS_OF(_error); }
|
||||
VALUE getError() const { return _error; }
|
||||
virtual ~SWIG_DIRECTOR_EXCEPTION() {}
|
||||
};
|
||||
/* Base class for director exceptions */
|
||||
class DirectorException {
|
||||
protected:
|
||||
VALUE _error;
|
||||
protected:
|
||||
DirectorException(VALUE error=Qnil) : _error(error) {}
|
||||
public:
|
||||
VALUE getType() const {
|
||||
return CLASS_OF(_error);
|
||||
}
|
||||
VALUE getError() const {
|
||||
return _error;
|
||||
}
|
||||
virtual ~DirectorException() {}
|
||||
};
|
||||
|
||||
/* Type mismatch in the return value from a Ruby method call */
|
||||
class SWIG_DIRECTOR_TYPE_MISMATCH : public SWIG_DIRECTOR_EXCEPTION {
|
||||
public:
|
||||
SWIG_DIRECTOR_TYPE_MISMATCH(const char *msg="") {
|
||||
VALUE str = rb_str_new2("Swig director type mismatch: ");
|
||||
rb_str_concat(str, rb_str_new2(msg));
|
||||
_error = rb_exc_new3(rb_eTypeError, str);
|
||||
}
|
||||
};
|
||||
/* Type mismatch in the return value from a Ruby method call */
|
||||
class DirectorTypeMismatchException : public Swig::DirectorException {
|
||||
public:
|
||||
DirectorTypeMismatchException(const char *msg="") {
|
||||
VALUE str = rb_str_new2("Swig director type mismatch: ");
|
||||
rb_str_concat(str, rb_str_new2(msg));
|
||||
_error = rb_exc_new3(rb_eTypeError, str);
|
||||
}
|
||||
};
|
||||
|
||||
/* Any Ruby exception that occurs during a director method call */
|
||||
class SWIG_DIRECTOR_METHOD_EXCEPTION : public SWIG_DIRECTOR_EXCEPTION {
|
||||
public:
|
||||
SWIG_DIRECTOR_METHOD_EXCEPTION(VALUE error) :SWIG_DIRECTOR_EXCEPTION(error) {}
|
||||
};
|
||||
/* Any Ruby exception that occurs during a director method call */
|
||||
class DirectorMethodException : public Swig::DirectorException {
|
||||
public:
|
||||
DirectorMethodException(VALUE error) : Swig::DirectorException(error) {}
|
||||
};
|
||||
|
||||
/* Attempted to call a pure virtual method via a director method */
|
||||
class SWIG_DIRECTOR_PURE_VIRTUAL_EXCEPTION : public SWIG_DIRECTOR_EXCEPTION {};
|
||||
/* Attempted to call a pure virtual method via a director method */
|
||||
class DirectorPureVirtualException : public Swig::DirectorException {};
|
||||
|
||||
|
||||
/* Simple thread abstraction for pthreads or win32 */
|
||||
/* Simple thread abstraction for pthreads on win32 */
|
||||
#ifdef __THREAD__
|
||||
#define __PTHREAD__
|
||||
#if defined(_WIN32) || defined(__WIN32__)
|
||||
#define pthread_mutex_lock EnterCriticalSection
|
||||
#define pthread_mutex_unlock LeaveCriticalSection
|
||||
#define pthread_mutex_t CRITICAL_SECTION
|
||||
#define MUTEX_INIT(var) CRITICAL_SECTION var
|
||||
#else
|
||||
#include <pthread.h>
|
||||
#define MUTEX_INIT(var) pthread_mutex_t var = PTHREAD_MUTEX_INITIALIZER
|
||||
#endif
|
||||
#endif
|
||||
|
||||
/* director base class */
|
||||
class __DIRECTOR__ {
|
||||
private:
|
||||
/* pointer to the wrapped Ruby object */
|
||||
VALUE _self;
|
||||
/* flag indicating whether the object is owned by Ruby or c++ */
|
||||
mutable bool _disown;
|
||||
/* shared flag for breaking recursive director calls */
|
||||
static bool _up;
|
||||
|
||||
#ifdef __PTHREAD__
|
||||
/* locks for sharing the _up flag in a threaded environment */
|
||||
static pthread_mutex_t _mutex_up;
|
||||
static bool _mutex_active;
|
||||
static pthread_t _mutex_thread;
|
||||
#endif
|
||||
|
||||
/* reset the _up flag once the routing direction has been determined */
|
||||
#ifdef __PTHREAD__
|
||||
void __clear_up() const {
|
||||
__DIRECTOR__::_up = false;
|
||||
__DIRECTOR__::_mutex_active = false;
|
||||
pthread_mutex_unlock(&_mutex_up);
|
||||
}
|
||||
#define __PTHREAD__
|
||||
#if defined(_WIN32) || defined(__WIN32__)
|
||||
#define pthread_mutex_lock EnterCriticalSection
|
||||
#define pthread_mutex_unlock LeaveCriticalSection
|
||||
#define pthread_mutex_t CRITICAL_SECTION
|
||||
#define MUTEX_INIT(var) CRITICAL_SECTION var
|
||||
#else
|
||||
void __clear_up() const {
|
||||
__DIRECTOR__::_up = false;
|
||||
}
|
||||
#include <pthread.h>
|
||||
#define MUTEX_INIT(var) pthread_mutex_t var = PTHREAD_MUTEX_INITIALIZER
|
||||
#endif
|
||||
#endif
|
||||
|
||||
public:
|
||||
/* wrap a Ruby object, optionally taking ownership */
|
||||
__DIRECTOR__(VALUE self, bool disown) : _self(self), _disown(disown) {
|
||||
}
|
||||
/* director base class */
|
||||
class Director {
|
||||
private:
|
||||
/* pointer to the wrapped Ruby object */
|
||||
VALUE _self;
|
||||
/* flag indicating whether the object is owned by Ruby or c++ */
|
||||
mutable bool _disown;
|
||||
/* shared flag for breaking recursive director calls */
|
||||
static bool _up;
|
||||
|
||||
/* discard our reference at destruction */
|
||||
virtual ~__DIRECTOR__() {
|
||||
}
|
||||
|
||||
/* return a pointer to the wrapped Ruby object */
|
||||
VALUE __get_self() const {
|
||||
return _self;
|
||||
}
|
||||
|
||||
|
||||
/* get the _up flag to determine if the method call should be routed
|
||||
* to the c++ base class or through the wrapped Ruby object
|
||||
*/
|
||||
#ifdef __PTHREAD__
|
||||
bool __get_up() const {
|
||||
if (__DIRECTOR__::_mutex_active) {
|
||||
if (pthread_equal(__DIRECTOR__::_mutex_thread, pthread_self())) {
|
||||
/* locks for sharing the _up flag in a threaded environment */
|
||||
static pthread_mutex_t _mutex_up;
|
||||
static bool _mutex_active;
|
||||
static pthread_t _mutex_thread;
|
||||
#endif
|
||||
|
||||
/* reset the _up flag once the routing direction has been determined */
|
||||
#ifdef __PTHREAD__
|
||||
void __clear_up() const {
|
||||
Swig::Director::_up = false;
|
||||
Swig::Director::_mutex_active = false;
|
||||
pthread_mutex_unlock(&_mutex_up);
|
||||
}
|
||||
#else
|
||||
void __clear_up() const {
|
||||
Swig::Director::_up = false;
|
||||
}
|
||||
#endif
|
||||
|
||||
public:
|
||||
/* wrap a Ruby object, optionally taking ownership */
|
||||
Director(VALUE self, bool disown) : _self(self), _disown(disown) {
|
||||
}
|
||||
|
||||
/* discard our reference at destruction */
|
||||
virtual ~Director() {
|
||||
}
|
||||
|
||||
/* return a pointer to the wrapped Ruby object */
|
||||
VALUE __get_self() const {
|
||||
return _self;
|
||||
}
|
||||
|
||||
|
||||
/* get the _up flag to determine if the method call should be routed
|
||||
* to the c++ base class or through the wrapped Ruby object
|
||||
*/
|
||||
#ifdef __PTHREAD__
|
||||
bool __get_up() const {
|
||||
if (Swig::Director::_mutex_active) {
|
||||
if (pthread_equal(Swig::Director::_mutex_thread, pthread_self())) {
|
||||
bool up = _up;
|
||||
__clear_up();
|
||||
return up;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
#else
|
||||
bool __get_up() const {
|
||||
bool up = _up;
|
||||
__clear_up();
|
||||
_up = false;
|
||||
return up;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
#else
|
||||
bool __get_up() const {
|
||||
bool up = _up;
|
||||
_up = false;
|
||||
return up;
|
||||
}
|
||||
#endif
|
||||
|
||||
/* set the _up flag if the next method call should be directed to
|
||||
* the c++ base class rather than the wrapped Ruby object
|
||||
*/
|
||||
|
||||
/* set the _up flag if the next method call should be directed to
|
||||
* the c++ base class rather than the wrapped Ruby object
|
||||
*/
|
||||
#ifdef __PTHREAD__
|
||||
void __set_up() const {
|
||||
pthread_mutex_lock(&__DIRECTOR__::_mutex_up);
|
||||
__DIRECTOR__::_mutex_thread = pthread_self();
|
||||
__DIRECTOR__::_mutex_active = true;
|
||||
__DIRECTOR__::_up = true;
|
||||
}
|
||||
void __set_up() const {
|
||||
pthread_mutex_lock(&Swig::Director::_mutex_up);
|
||||
Swig::Director::_mutex_thread = pthread_self();
|
||||
Swig::Director::_mutex_active = true;
|
||||
Swig::Director::_up = true;
|
||||
}
|
||||
#else
|
||||
void __set_up() const {
|
||||
__DIRECTOR__::_up = true;
|
||||
}
|
||||
void __set_up() const {
|
||||
Swig::Director::_up = true;
|
||||
}
|
||||
#endif
|
||||
|
||||
/* acquire ownership of the wrapped Ruby object (the sense of "disown"
|
||||
* is from Ruby) */
|
||||
void __disown() const {
|
||||
if (!_disown) {
|
||||
_disown = true;
|
||||
}
|
||||
}
|
||||
};
|
||||
/* acquire ownership of the wrapped Ruby object (the sense of "disown"
|
||||
* is from Ruby) */
|
||||
void __disown() const {
|
||||
if (!_disown) {
|
||||
_disown = true;
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
bool __DIRECTOR__::_up = false;
|
||||
bool Swig::Director::_up = false;
|
||||
|
||||
#ifdef __PTHREAD__
|
||||
MUTEX_INIT(__DIRECTOR__::_mutex_up);
|
||||
pthread_t __DIRECTOR__::_mutex_thread;
|
||||
int __DIRECTOR__::_mutex_active = false;
|
||||
MUTEX_INIT(Swig::Director::_mutex_up);
|
||||
pthread_t Swig::Director::_mutex_thread;
|
||||
int Swig::Director::_mutex_active = false;
|
||||
#endif
|
||||
|
||||
}
|
||||
|
||||
#endif /* __cplusplus */
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -425,7 +425,7 @@
|
|||
/* no can do... see python.cxx
|
||||
%typemap(directorin) DIRECTORTYPE * {
|
||||
{
|
||||
__DIRECTOR__$1_ltype proxy = dynamic_cast<__DIRECTOR__$1_ltype>($1_name);
|
||||
SwigDirector::$1_ltype proxy = dynamic_cast<SwigDirector::$1_ltype>($1_name);
|
||||
if (!proxy) {
|
||||
$input = SWIG_NewPointerObj((void *) $1_name, $1_descriptor, 0);
|
||||
} else {
|
||||
|
|
@ -474,9 +474,9 @@ DIRECTOROUT_TYPEMAP(bool, RTEST);
|
|||
%typemap(directorout) SWIGTYPE *,
|
||||
SWIGTYPE &,
|
||||
SWIGTYPE []
|
||||
"if ((SWIG_ConvertPtr($input,(void **) &$result, $descriptor,SWIG_POINTER_EXCEPTION | $disown )) == -1) throw SWIG_DIRECTOR_TYPE_MISMATCH(\"Pointer conversion failed.\");";
|
||||
"if ((SWIG_ConvertPtr($input,(void **) &$result, $descriptor,SWIG_POINTER_EXCEPTION | $disown )) == -1) throw Swig::DirectorTypeMismatchException(\"Pointer conversion failed.\");";
|
||||
|
||||
%typemap(directorout) void * "if ((SWIG_ConvertPtr($input,(void **) &$result, 0, SWIG_POINTER_EXCEPTION | $disown )) == -1) throw SWIG_DIRECTOR_TYPE_MISMATCH(\"Pointer conversion failed.\");";
|
||||
%typemap(directorout) void * "if ((SWIG_ConvertPtr($input,(void **) &$result, 0, SWIG_POINTER_EXCEPTION | $disown )) == -1) throw Swig::DirectorTypeMismatchException(\"Pointer conversion failed.\");";
|
||||
|
||||
/* ---------------------------------------------------------------------
|
||||
* typedef & typemaps for VALUE (passed through unmodified and unchecked)
|
||||
|
|
|
|||
|
|
@ -62,7 +62,7 @@ namespace std {
|
|||
if (TYPE($input) == T_STRING)
|
||||
$result = std::string(StringValuePtr($input));
|
||||
else
|
||||
throw SWIG_DIRECTOR_TYPE_MISMATCH("string expected");
|
||||
throw Swig::DirectorTypeMismatchException("string expected");
|
||||
}
|
||||
|
||||
%typemap(directorout) const string & (std::string temp) {
|
||||
|
|
@ -70,7 +70,7 @@ namespace std {
|
|||
temp = std::string(StringValuePtr($input));
|
||||
$result = &temp;
|
||||
} else {
|
||||
throw SWIG_DIRECTOR_TYPE_MISMATCH("string expected");
|
||||
throw Swig::DirectorTypeMismatchException("string expected");
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue