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

Fix for exception specifications that are references. Also improves the generated

Browse source 
exception declarations in the catch handler for pointers - a pointer is used
instead of a reference to a pointer.


git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@5940 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
William S Fulton 2004-05-29 15:03:46 +00:00
commit 4d6578deea
1 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

10
SWIG/Source/Modules/emit.cxx
View file

@ -405,7 +405,7 @@ void emit_action(Node *n, Wrapper *f) {
/* saves action -> eaction for postcatching exception */ /* saves action -> eaction for postcatching exception */
String *eaction = NewString(""); String *eaction = NewString("");
/* If we are in C++ mode and there is a throw specifier. We're going to /* If we are in C++ mode and there is an exception specification. We're going to
enclose the block in a try block */ enclose the block in a try block */
if (throws) { if (throws) {
Printf(eaction,"try {\n"); Printf(eaction,"try {\n");
@ -419,7 +419,13 @@ void emit_action(Node *n, Wrapper *f) {
for (Parm *ep = throws; ep; ep = nextSibling(ep)) { for (Parm *ep = throws; ep; ep = nextSibling(ep)) {
String *em = Swig_typemap_lookup_new("throws",ep,"_e",0); String *em = Swig_typemap_lookup_new("throws",ep,"_e",0);
if (em) { if (em) {
Printf(eaction,"catch(%s) {\n", SwigType_str(Getattr(ep,"type"),"&_e")); SwigType *et = Getattr(ep,"type");
SwigType *etr = SwigType_typedef_resolve_all(et);
if (SwigType_isreference(etr) || SwigType_ispointer(etr)) {
Printf(eaction,"catch(%s) {\n", SwigType_str(et, "_e"));
} else {
Printf(eaction,"catch(%s) {\n", SwigType_str(et, "&_e"));
}
Printv(eaction,em,"\n",NIL); Printv(eaction,em,"\n",NIL);
Printf(eaction,"}\n"); Printf(eaction,"}\n");
} else { } else {