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

More conventional variable naming in directorExceptHandling

Browse source
This commit is contained in:
William S Fulton 2013-10-24 08:03:33 +01:00
commit cf4f5e8118
1 changed files with 16 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

32
Source/Modules/java.cxx
View file

@ -4166,26 +4166,26 @@ public:
void directorExceptHandler(Node *n, ParmList *throw_parm_list, Wrapper *w) { void directorExceptHandler(Node *n, ParmList *throw_parm_list, Wrapper *w) {
String *featdirexcp = Getattr(n, "feature:director:except"); String *directorexcept = Getattr(n, "feature:director:except");
if (!featdirexcp) { if (!directorexcept) {
featdirexcp = NewString(""); directorexcept = NewString("");
Printf(featdirexcp, "jthrowable $error = jenv->ExceptionOccurred();\n"); Printf(directorexcept, "jthrowable $error = jenv->ExceptionOccurred();\n");
Printf(featdirexcp, "if ($error) {\n"); Printf(directorexcept, "if ($error) {\n");
Printf(featdirexcp, " jenv->ExceptionClear();$directorthrowshandlers\n"); Printf(directorexcept, " jenv->ExceptionClear();$directorthrowshandlers\n");
Printf(featdirexcp, " throw Swig::DirectorException(jenv, $error);\n"); Printf(directorexcept, " throw Swig::DirectorException(jenv, $error);\n");
Printf(featdirexcp, "}\n"); Printf(directorexcept, "}\n");
} else { } else {
featdirexcp = Copy(featdirexcp); directorexcept = Copy(directorexcept);
} }
// Can explicitly disable director:except by setting to "" or "0" // Can explicitly disable director:except by setting to "" or "0"
if (Len(featdirexcp) > 0 && Cmp(featdirexcp, "0") != 0) { if (Len(directorexcept) > 0 && Cmp(directorexcept, "0") != 0) {
// Replace $packagepath // Replace $packagepath
substitutePackagePath(featdirexcp, 0); substitutePackagePath(directorexcept, 0);
// Replace $directorthrowshandlers with any defined typemap handlers (or nothing) // Replace $directorthrowshandlers with any defined typemap handlers (or nothing)
if (Strstr(featdirexcp, "$directorthrowshandlers")) { if (Strstr(directorexcept, "$directorthrowshandlers")) {
String *directorthrowshandlers_code = NewString(""); String *directorthrowshandlers_code = NewString("");
for (Parm *p = throw_parm_list; p; p = nextSibling(p)) { for (Parm *p = throw_parm_list; p; p = nextSibling(p)) {
@ -4202,14 +4202,14 @@ public:
Swig_warning(WARN_TYPEMAP_DIRECTORTHROWS_UNDEF, Getfile(n), Getline(n), "No directorthrows typemap defined for %s\n", SwigType_str(t, 0)); Swig_warning(WARN_TYPEMAP_DIRECTORTHROWS_UNDEF, Getfile(n), Getline(n), "No directorthrows typemap defined for %s\n", SwigType_str(t, 0));
} }
} }
Replaceall(featdirexcp, "$directorthrowshandlers", directorthrowshandlers_code); Replaceall(directorexcept, "$directorthrowshandlers", directorthrowshandlers_code);
Delete(directorthrowshandlers_code); Delete(directorthrowshandlers_code);
} }
Replaceall(featdirexcp, "$error", "swigerror"); Replaceall(directorexcept, "$error", "swigerror");
Printf(w->code, " %s\n", featdirexcp); Printf(w->code, " %s\n", directorexcept);
} }
Delete(featdirexcp); Delete(directorexcept);
} }
/* ------------------------------------------------------------ /* ------------------------------------------------------------