3d6880aad1
The proxy layer, and all the extra complexity associated with it, seemed to be only necessary in order to try to allow using the same name for the wrapped global functions as were used for them in the original C or C++ code being wrapped. However this could simply never work in all cases, notably it didn't work at all when using ELF shared libraries under Unix as the functions with the same name defined in the main program were interposed and replaced the functions defined in the shared library, meaning that the proxy function foo() called wrapper function _wrap_foo() which called back into proxy function foo() itself again, resulting in guaranteed stack overflow. The only possible way to fix this would be to use "protected" ELF visibility for the original functions, but this is not always possible (e.g. if the sources of the original library are not available) and not simple even when it is and, besides, protected visibility has its own problems -- notably by making it impossible to hook the library functions when you actually want to do it. Besides, proxy-based approach simply couldn't work at all when using static linking as it resulted in two copies of the function with the same name Most importantly, however, the main task of this module is to wrap C++ classes, not C functions, and renaming them in the wrapper is not necessary at all in this case as there is no conflict with the original names in this case. So simply drop the idea of generating a separate proxy header and generate a header declaring the functions declared in the wrapper instead and, also, do not give them "_wrap_" prefix whenever possible, i.e. only do it for the global functions. This simplifies SWIG code itself and makes it simpler to use its output as it's not necessary to link both with the wrapper (dynamically) and with the proxy (statically) and it's not enough to link with the wrapper only and it can be done in any way (i.e. either statically or dynamically). As a side effect of this change, Swig_name_proxy() is not necessary any more and was removed, eliminating the only difference with the master branch in any source file other than c.cxx itself.
37 lines
930 B
C
37 lines
930 B
C
#include "example_wrap.h"
|
|
|
|
int main() {
|
|
Klass *klass = new_Klass();
|
|
Vint *vint = Klass_vi_get(klass);
|
|
VA *va = Klass_va_get(klass);
|
|
|
|
printf("Vector of ints:\n");
|
|
printf("size=%d\ncapacity=%d\n\n", Vint_size(vint), Vint_capacity(vint));
|
|
|
|
int i;
|
|
for (i = 0; i < 10; i++)
|
|
Vint_push_back(vint, i*i);
|
|
|
|
printf("size=%d\ncapacity=%d\n\n", Vint_size(vint), Vint_capacity(vint));
|
|
|
|
for (i = 0; i < Vint_size(vint); i++)
|
|
printf("%d%c", Vint_at(vint, i), i+1 == Vint_size(vint) ? '\n' : ',');
|
|
|
|
Vint_clear(vint);
|
|
Vint_reserve(vint, 100);
|
|
printf("\nsize=%d\ncapacity=%d\n", Vint_size(vint), Vint_capacity(vint));
|
|
|
|
printf("\nVector of objects:\n");
|
|
|
|
for (i = 0; i < 10; i++) {
|
|
A *a = new_A_std_string_i("hello", i);
|
|
VA_push_back(va, a);
|
|
}
|
|
|
|
for (i = 0; i < VA_size(va); i++) {
|
|
A *a = VA_at(va, i);
|
|
printf("%s %d\n", A_name_get(a), A_value_get(a));
|
|
}
|
|
|
|
SWIG_exit(0);
|
|
}
|