use exception specification instead of %exception to handle STL error checking

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk/SWIG@7352 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
William S Fulton 2005-07-27 20:09:42 +00:00
commit 03a67698a9
34 changed files with 299 additions and 849 deletions

View file

@ -5,24 +5,7 @@
//
// Ruby implementation
%include std_common.i
%include exception.i
%exception std::map::__getitem__ {
try {
$action
} catch (std::out_of_range& e) {
SWIG_exception(SWIG_IndexError,const_cast<char*>(e.what()));
}
}
%exception std::map::__delitem__ {
try {
$action
} catch (std::out_of_range& e) {
SWIG_exception(SWIG_IndexError,const_cast<char*>(e.what()));
}
}
%include <std_common.i>
// ------------------------------------------------------------------------
// std::map
@ -192,7 +175,7 @@ namespace std {
bool empty() const;
void clear();
%extend {
T& __getitem__(const K& key) {
T& __getitem__(const K& key) throw (std::out_of_range) {
std::map<K,T >::iterator i = self->find(key);
if (i != self->end())
return i->second;
@ -202,7 +185,7 @@ namespace std {
void __setitem__(const K& key, const T& x) {
(*self)[key] = x;
}
T __delitem__(const K& key) {
T __delitem__(const K& key) throw (std::out_of_range) {
std::map<K,T >::iterator i = self->find(key);
if (i != self->end()) {
T x = i->second;
@ -396,7 +379,7 @@ namespace std {
bool empty() const;
void clear();
%extend {
T& __getitem__(K key) {
T& __getitem__(K key) throw (std::out_of_range) {
std::map<K,T >::iterator i = self->find(key);
if (i != self->end())
return i->second;
@ -406,7 +389,7 @@ namespace std {
void __setitem__(K key, const T& x) {
(*self)[key] = x;
}
T __delitem__(K key) {
T __delitem__(K key) throw (std::out_of_range) {
std::map<K,T >::iterator i = self->find(key);
if (i != self->end()) {
T x = i->second;
@ -594,7 +577,7 @@ namespace std {
bool empty() const;
void clear();
%extend {
T __getitem__(const K& key) {
T __getitem__(const K& key) throw (std::out_of_range) {
std::map<K,T >::iterator i = self->find(key);
if (i != self->end())
return i->second;
@ -604,7 +587,7 @@ namespace std {
void __setitem__(const K& key, T x) {
(*self)[key] = x;
}
T __delitem__(const K& key) {
T __delitem__(const K& key) throw (std::out_of_range) {
std::map<K,T >::iterator i = self->find(key);
if (i != self->end()) {
T x = i->second;
@ -779,7 +762,7 @@ namespace std {
bool empty() const;
void clear();
%extend {
T __getitem__(K key) {
T __getitem__(K key) throw (std::out_of_range) {
std::map<K,T >::iterator i = self->find(key);
if (i != self->end())
return i->second;
@ -789,7 +772,7 @@ namespace std {
void __setitem__(K key, T x) {
(*self)[key] = x;
}
T __delitem__(K key) {
T __delitem__(K key) throw (std::out_of_range) {
std::map<K,T >::iterator i = self->find(key);
if (i != self->end()) {
T x = i->second;