jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

use internal SWIG_exception_fail, let SWIG_exception as in 1.3.27

Browse source 
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk/SWIG@8434 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
Marcelo Matus 2006-01-14 21:23:36 +00:00
commit 507a8184cc
10 changed files with 40 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Lib/perl5/exception.i
View file

@ -1 +1,5 @@
%include <typemaps/exception.swg> %include <typemaps/exception.swg>
%insert("runtime") {
%define_as(SWIG_exception(code, msg), %block(%error(code, msg);))
}

5
Lib/python/exception.i
View file

@ -1 +1,6 @@
%include <typemaps/exception.swg> %include <typemaps/exception.swg>
%insert("runtime") {
%define_as(SWIG_exception(code, msg), %block(%error(code, msg); SWIG_fail; ))
}

4
Lib/ruby/exception.i
View file

@ -1 +1,5 @@
%include <typemaps/exception.swg> %include <typemaps/exception.swg>
%insert("runtime") {
%define_as(SWIG_exception(code, msg), %block(%error(code, msg);))
}

6
Lib/ruby/ruby.swg
View file

@ -5,8 +5,9 @@
* ------------------------------------------------------------ */ * ------------------------------------------------------------ */
/* ------------------------------------------------------------ /* ------------------------------------------------------------
* The Ruby global rename rules * The Ruby auto rename rules
* ------------------------------------------------------------ */ * ------------------------------------------------------------ */
#if defined(SWIG_RUBY_AUTORENAME)
/* Class names are CamelCase */ /* Class names are CamelCase */
%rename("%(camelcase)s", %isclass) ""; %rename("%(camelcase)s", %isclass) "";
@ -16,7 +17,8 @@
/* Method names should be changed so that they are /* Method names should be changed so that they are
lower_case_with_underscores */ lower_case_with_underscores */
%rename("%(undercase)s", %isfunction, %ismember) ""; %rename("%(undercase)s", %isfunction, %ismember) "";
#endif
/* ------------------------------------------------------------ /* ------------------------------------------------------------
* Inner macros * Inner macros

5
Lib/tcl/exception.i
View file

@ -1 +1,6 @@
%include <typemaps/exception.swg> %include <typemaps/exception.swg>
%insert("runtime") {
%define_as(SWIG_exception(code, msg), %block(%error(code, msg); return TCL_ERROR;))
}

2
Lib/typemaps/attribute.swg
View file

@ -67,7 +67,7 @@
*/ */
#ifndef %attribute_exception #ifndef %attribute_exception
#define %attribute_exception(code,msg) SWIG_exception(code,msg) #define %attribute_exception(code,msg) SWIG_exception_fail(code,msg)
#endif #endif
// //

23
Lib/typemaps/exception.swg
View file

@ -19,8 +19,7 @@
%insert("runtime") { %insert("runtime") {
%define_as(SWIG_exception(code, msg), %define_as(SWIG_exception_fail(code, msg), %block(%error(code, msg); SWIG_fail))
%block(%error(code, msg); SWIG_fail))
%define_as(SWIG_contract_assert(expr, msg), %define_as(SWIG_contract_assert(expr, msg),
if (!(expr)) { %error(SWIG_RuntimeError, msg); SWIG_fail; } else) if (!(expr)) { %error(SWIG_RuntimeError, msg); SWIG_fail; } else)
@ -41,7 +40,7 @@
} }
SWIG_CATCH_STDEXCEPT // catch std::exception SWIG_CATCH_STDEXCEPT // catch std::exception
catch (...) { catch (...) {
SWIG_exception(SWIG_UnknownError, "Unknown exception"); SWIG_exception_fail(SWIG_UnknownError, "Unknown exception");
} }
} }
*/ */
@ -51,27 +50,27 @@
%define SWIG_CATCH_STDEXCEPT %define SWIG_CATCH_STDEXCEPT
/* catching std::exception */ /* catching std::exception */
catch (std::invalid_argument& e) { catch (std::invalid_argument& e) {
SWIG_exception(SWIG_ValueError, e.what() ); SWIG_exception_fail(SWIG_ValueError, e.what() );
} catch (std::domain_error& e) { } catch (std::domain_error& e) {
SWIG_exception(SWIG_ValueError, e.what() ); SWIG_exception_fail(SWIG_ValueError, e.what() );
} catch (std::overflow_error& e) { } catch (std::overflow_error& e) {
SWIG_exception(SWIG_OverflowError, e.what() ); SWIG_exception_fail(SWIG_OverflowError, e.what() );
} catch (std::out_of_range& e) { } catch (std::out_of_range& e) {
SWIG_exception(SWIG_IndexError, e.what() ); SWIG_exception_fail(SWIG_IndexError, e.what() );
} catch (std::length_error& e) { } catch (std::length_error& e) {
SWIG_exception(SWIG_IndexError, e.what() ); SWIG_exception_fail(SWIG_IndexError, e.what() );
} catch (std::runtime_error& e) { } catch (std::runtime_error& e) {
SWIG_exception(SWIG_RuntimeError, e.what() ); SWIG_exception_fail(SWIG_RuntimeError, e.what() );
} catch (std::exception& e) { } catch (std::exception& e) {
SWIG_exception(SWIG_SystemError, e.what() ); SWIG_exception_fail(SWIG_SystemError, e.what() );
} }
%enddef %enddef
%define SWIG_CATCH_UNKNOWN %define SWIG_CATCH_UNKNOWN
catch (std::exception& e) { catch (std::exception& e) {
SWIG_exception(SWIG_SystemError, e.what() ); SWIG_exception_fail(SWIG_SystemError, e.what() );
} }
catch (...) { catch (...) {
SWIG_exception(SWIG_UnknownError, "unknown exception"); SWIG_exception_fail(SWIG_UnknownError, "unknown exception");
} }
%enddef %enddef

2
Lib/typemaps/std_except.swg
View file

@ -12,7 +12,7 @@
%exceptionclass Exception; %exceptionclass Exception;
#if !defined(SWIG_STD_EXCEPTIONS_AS_CLASSES) #if !defined(SWIG_STD_EXCEPTIONS_AS_CLASSES)
%typemap(throws,noblock=1) Exception { %typemap(throws,noblock=1) Exception {
SWIG_exception(Code, $1.what()); SWIG_exception_fail(Code, $1.what());
} }
%ignore Exception; %ignore Exception;
struct Exception { struct Exception {

2
Lib/typemaps/swigtype.swg
View file

@ -439,7 +439,7 @@
} }
%typemap(throws,noblock=1) (...) { %typemap(throws,noblock=1) (...) {
SWIG_exception(SWIG_RuntimeError,"unknown exception"); SWIG_exception_fail(SWIG_RuntimeError,"unknown exception");
} }
/* ------------------------------------------------------------ /* ------------------------------------------------------------

8
Lib/typemaps/swigtypemaps.swg
View file

@ -133,10 +133,10 @@
#define %error_block(Block...) %block(Block) #define %error_block(Block...) %block(Block)
#define %default_code(code) ((code != SWIG_ERROR) ? code : SWIG_TypeError) #define %default_code(code) ((code != SWIG_ERROR) ? code : SWIG_TypeError)
#define %argument_fail(code, type, name, argn) SWIG_exception(%default_code(code), %argfail_fmt(type, name, argn)) #define %argument_fail(code, type, name, argn) SWIG_exception_fail(%default_code(code), %argfail_fmt(type, name, argn))
#define %argument_nullref(type, name, argn) SWIG_exception(SWIG_ValueError, %argnullref_fmt(type, name, argn)) #define %argument_nullref(type, name, argn) SWIG_exception_fail(SWIG_ValueError, %argnullref_fmt(type, name, argn))
#define %variable_fail(code, type, name) SWIG_exception(%default_code(code), %varfail_fmt(type, name)) #define %variable_fail(code, type, name) SWIG_exception_fail(%default_code(code), %varfail_fmt(type, name))
#define %variable_nullref(type, name) SWIG_exception(SWIG_ValueError, %varnullref_fmt(type, name)) #define %variable_nullref(type, name) SWIG_exception_fail(SWIG_ValueError, %varnullref_fmt(type, name))
#if defined(SWIG_DIRECTOR_TYPEMAPS) #if defined(SWIG_DIRECTOR_TYPEMAPS)
#define %dirout_fail(code, type) SWIG_DirOutFail(%default_code(code), %outfail_fmt(type)) #define %dirout_fail(code, type) SWIG_DirOutFail(%default_code(code), %outfail_fmt(type))