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

Cosmetic whitespace improvement in generated code from throws typemaps.

Browse source
This commit is contained in:
William S Fulton 2017-11-24 18:17:39 +00:00
commit eef3e7aa8f
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Source/Modules/emit.cxx
View file

@ -483,29 +483,29 @@ String *emit_action(Node *n) {
if (catchlist) { if (catchlist) {
int unknown_catch = 0; int unknown_catch = 0;
int has_varargs = 0; int has_varargs = 0;
Printf(eaction, "} "); Printf(eaction, "}");
for (Parm *ep = catchlist; ep; ep = nextSibling(ep)) { for (Parm *ep = catchlist; ep; ep = nextSibling(ep)) {
String *em = Swig_typemap_lookup("throws", ep, "_e", 0); String *em = Swig_typemap_lookup("throws", ep, "_e", 0);
if (em) { if (em) {
SwigType *et = Getattr(ep, "type"); SwigType *et = Getattr(ep, "type");
SwigType *etr = SwigType_typedef_resolve_all(et); SwigType *etr = SwigType_typedef_resolve_all(et);
if (SwigType_isreference(etr) || SwigType_ispointer(etr) || SwigType_isarray(etr)) { if (SwigType_isreference(etr) || SwigType_ispointer(etr) || SwigType_isarray(etr)) {
Printf(eaction, "catch(%s) {", SwigType_str(et, "_e")); Printf(eaction, " catch(%s) {", SwigType_str(et, "_e"));
} else if (SwigType_isvarargs(etr)) { } else if (SwigType_isvarargs(etr)) {
Printf(eaction, "catch(...) {"); Printf(eaction, " catch(...) {");
has_varargs = 1; has_varargs = 1;
} else { } else {
Printf(eaction, "catch(%s) {", SwigType_str(et, "&_e")); Printf(eaction, " catch(%s) {", SwigType_str(et, "&_e"));
} }
Printv(eaction, em, "\n", NIL); Printv(eaction, em, "\n", NIL);
Printf(eaction, "}\n"); Printf(eaction, "}");
} else { } else {
Swig_warning(WARN_TYPEMAP_THROW, Getfile(n), Getline(n), "No 'throws' typemap defined for exception type '%s'\n", SwigType_str(Getattr(ep, "type"), 0)); Swig_warning(WARN_TYPEMAP_THROW, Getfile(n), Getline(n), "No 'throws' typemap defined for exception type '%s'\n", SwigType_str(Getattr(ep, "type"), 0));
unknown_catch = 1; unknown_catch = 1;
} }
} }
if (unknown_catch && !has_varargs) { if (unknown_catch && !has_varargs) {
Printf(eaction, "catch(...) { throw; }\n"); Printf(eaction, " catch(...) {\nthrow;\n}");
} }
} }