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

Refactor Java director swig_override array code

Browse source 
Remove code duplication: Use new Swig::BoolArray to replace multiple
instances of ZeroedBoolArray.

Refactors #403 and #413.
This commit is contained in:
William S Fulton 2015-05-09 14:48:45 +01:00
commit 775afd3579
2 changed files with 15 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Lib/java/director.swg
View file

@ -209,6 +209,20 @@ namespace Swig {
}
};
// Zero initialized bool array
template<size_t N> class BoolArray {
bool array_[N];
public:
BoolArray() {
memset(array_, sizeof(array_), 0);
}
bool& operator[](size_t n) {
return array_[n];
}
bool operator[](size_t n) const {
return array_[n];
}
};
// Utility classes and functions for exception handling.

8
Source/Modules/java.cxx
View file

@ -4489,13 +4489,7 @@ public:
Printf(f_directors_h, " return (n < %d ? swig_override[n] : false);\n", n_methods);
Printf(f_directors_h, " }\n");
Printf(f_directors_h, "protected:\n");
Printf(f_directors_h, " struct ZeroedBoolArray {\n");
Printf(f_directors_h, " bool array[%d];\n", n_methods);
Printf(f_directors_h, " ZeroedBoolArray() { memset(array, sizeof(array), 0); }\n");
Printf(f_directors_h, " bool& operator[](int n) { return array[n]; }\n");
Printf(f_directors_h, " bool operator[](int n) const { return array[n]; }\n");
Printf(f_directors_h, " };\n");
Printf(f_directors_h, " ZeroedBoolArray swig_override;\n");
Printf(f_directors_h, " Swig::BoolArray<%d> swig_override;\n", n_methods);
/* Emit the code to look up the class's methods, initialize the override array */