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

Merge branch 'missing-initializers'

Browse source 
* missing-initializers:
  Tcl fix when using -Wmissing-field-initializers warnings
  Php fix for -Wmissing-field-initializers warning
  Fixes for Octave and missing -Wmissing-field-initializers in swig_octave_member
  Fixes for Ruby and using -Wmissing-field-initializers
  R test case warning fixes
  Use -Wmissing-field-initializers warning testing all languages on Travis
This commit is contained in:
William S Fulton 2015-12-19 16:34:38 +00:00
commit adc773455d
10 changed files with 34 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Examples/test-suite/r_copy_struct.i
View file

@ -48,7 +48,7 @@ getA()
return a; return a;
} }
static struct A fixed = {20, 3, 42.0}; static struct A fixed = {20, 3, 42.0, 0, 0};
struct A * struct A *
getARef() getARef()

4
Lib/php/phprun.swg
View file

@ -24,6 +24,10 @@ extern "C" {
# define SWIG_ZEND_NAMED_FE(ZN, N, A) ZEND_NAMED_FE(ZN, N, A) # define SWIG_ZEND_NAMED_FE(ZN, N, A) ZEND_NAMED_FE(ZN, N, A)
#endif #endif
#ifndef ZEND_FE_END
# define ZEND_FE_END { NULL, NULL, NULL }
#endif
#ifndef Z_SET_ISREF_P #ifndef Z_SET_ISREF_P
/* For PHP < 5.3 */ /* For PHP < 5.3 */
# define Z_SET_ISREF_P(z) (z)->is_ref = 1 # define Z_SET_ISREF_P(z) (z)->is_ref = 1

24
Lib/ruby/boost_shared_ptr.i
View file

@ -26,7 +26,7 @@
// plain value // plain value
%typemap(in) CONST TYPE (void *argp, int res = 0) { %typemap(in) CONST TYPE (void *argp, int res = 0) {
swig_ruby_owntype newmem = {0}; swig_ruby_owntype newmem = {0, 0};
res = SWIG_ConvertPtrAndOwn($input, &argp, $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), %convertptr_flags, &newmem); res = SWIG_ConvertPtrAndOwn($input, &argp, $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), %convertptr_flags, &newmem);
if (!SWIG_IsOK(res)) { if (!SWIG_IsOK(res)) {
%argument_fail(res, "$type", $symname, $argnum); %argument_fail(res, "$type", $symname, $argnum);
@ -45,7 +45,7 @@
%typemap(varin) CONST TYPE { %typemap(varin) CONST TYPE {
void *argp = 0; void *argp = 0;
swig_ruby_owntype newmem = {0}; swig_ruby_owntype newmem = {0, 0};
int res = SWIG_ConvertPtrAndOwn($input, &argp, $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), %convertptr_flags, &newmem); int res = SWIG_ConvertPtrAndOwn($input, &argp, $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), %convertptr_flags, &newmem);
if (!SWIG_IsOK(res)) { if (!SWIG_IsOK(res)) {
%variable_fail(res, "$type", "$name"); %variable_fail(res, "$type", "$name");
@ -65,7 +65,7 @@
// plain pointer // plain pointer
// Note: $disown not implemented by default as it will lead to a memory leak of the shared_ptr instance // Note: $disown not implemented by default as it will lead to a memory leak of the shared_ptr instance
%typemap(in) CONST TYPE * (void *argp = 0, int res = 0, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > tempshared, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *smartarg = 0) { %typemap(in) CONST TYPE * (void *argp = 0, int res = 0, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > tempshared, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *smartarg = 0) {
swig_ruby_owntype newmem = {0}; swig_ruby_owntype newmem = {0, 0};
res = SWIG_ConvertPtrAndOwn($input, &argp, $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), SHARED_PTR_DISOWN | %convertptr_flags, &newmem); res = SWIG_ConvertPtrAndOwn($input, &argp, $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), SHARED_PTR_DISOWN | %convertptr_flags, &newmem);
if (!SWIG_IsOK(res)) { if (!SWIG_IsOK(res)) {
%argument_fail(res, "$type", $symname, $argnum); %argument_fail(res, "$type", $symname, $argnum);
@ -87,7 +87,7 @@
%typemap(varin) CONST TYPE * { %typemap(varin) CONST TYPE * {
void *argp = 0; void *argp = 0;
swig_ruby_owntype newmem = {0}; swig_ruby_owntype newmem = {0, 0};
int res = SWIG_ConvertPtrAndOwn($input, &argp, $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), %convertptr_flags, &newmem); int res = SWIG_ConvertPtrAndOwn($input, &argp, $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), %convertptr_flags, &newmem);
if (!SWIG_IsOK(res)) { if (!SWIG_IsOK(res)) {
%variable_fail(res, "$type", "$name"); %variable_fail(res, "$type", "$name");
@ -110,7 +110,7 @@
// plain reference // plain reference
%typemap(in) CONST TYPE & (void *argp = 0, int res = 0, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > tempshared) { %typemap(in) CONST TYPE & (void *argp = 0, int res = 0, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > tempshared) {
swig_ruby_owntype newmem = {0}; swig_ruby_owntype newmem = {0, 0};
res = SWIG_ConvertPtrAndOwn($input, &argp, $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), %convertptr_flags, &newmem); res = SWIG_ConvertPtrAndOwn($input, &argp, $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), %convertptr_flags, &newmem);
if (!SWIG_IsOK(res)) { if (!SWIG_IsOK(res)) {
%argument_fail(res, "$type", $symname, $argnum); %argument_fail(res, "$type", $symname, $argnum);
@ -131,7 +131,7 @@
%typemap(varin) CONST TYPE & { %typemap(varin) CONST TYPE & {
void *argp = 0; void *argp = 0;
swig_ruby_owntype newmem = {0}; swig_ruby_owntype newmem = {0, 0};
int res = SWIG_ConvertPtrAndOwn($input, &argp, $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), %convertptr_flags, &newmem); int res = SWIG_ConvertPtrAndOwn($input, &argp, $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), %convertptr_flags, &newmem);
if (!SWIG_IsOK(res)) { if (!SWIG_IsOK(res)) {
%variable_fail(res, "$type", "$name"); %variable_fail(res, "$type", "$name");
@ -156,7 +156,7 @@
// plain pointer by reference // plain pointer by reference
// Note: $disown not implemented by default as it will lead to a memory leak of the shared_ptr instance // Note: $disown not implemented by default as it will lead to a memory leak of the shared_ptr instance
%typemap(in) TYPE *CONST& (void *argp = 0, int res = 0, $*1_ltype temp = 0, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > tempshared) { %typemap(in) TYPE *CONST& (void *argp = 0, int res = 0, $*1_ltype temp = 0, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > tempshared) {
swig_ruby_owntype newmem = {0}; swig_ruby_owntype newmem = {0, 0};
res = SWIG_ConvertPtrAndOwn($input, &argp, $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), SHARED_PTR_DISOWN | %convertptr_flags, &newmem); res = SWIG_ConvertPtrAndOwn($input, &argp, $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), SHARED_PTR_DISOWN | %convertptr_flags, &newmem);
if (!SWIG_IsOK(res)) { if (!SWIG_IsOK(res)) {
%argument_fail(res, "$type", $symname, $argnum); %argument_fail(res, "$type", $symname, $argnum);
@ -184,7 +184,7 @@
// shared_ptr by value // shared_ptr by value
%typemap(in) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > (void *argp, int res = 0) { %typemap(in) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > (void *argp, int res = 0) {
swig_ruby_owntype newmem = {0}; swig_ruby_owntype newmem = {0, 0};
res = SWIG_ConvertPtrAndOwn($input, &argp, $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), %convertptr_flags, &newmem); res = SWIG_ConvertPtrAndOwn($input, &argp, $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), %convertptr_flags, &newmem);
if (!SWIG_IsOK(res)) { if (!SWIG_IsOK(res)) {
%argument_fail(res, "$type", $symname, $argnum); %argument_fail(res, "$type", $symname, $argnum);
@ -198,7 +198,7 @@
} }
%typemap(varin) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > { %typemap(varin) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > {
swig_ruby_owntype newmem = {0}; swig_ruby_owntype newmem = {0, 0};
void *argp = 0; void *argp = 0;
int res = SWIG_ConvertPtrAndOwn($input, &argp, $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), %convertptr_flags, &newmem); int res = SWIG_ConvertPtrAndOwn($input, &argp, $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), %convertptr_flags, &newmem);
if (!SWIG_IsOK(res)) { if (!SWIG_IsOK(res)) {
@ -214,7 +214,7 @@
// shared_ptr by reference // shared_ptr by reference
%typemap(in) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > & (void *argp, int res = 0, $*1_ltype tempshared) { %typemap(in) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > & (void *argp, int res = 0, $*1_ltype tempshared) {
swig_ruby_owntype newmem = {0}; swig_ruby_owntype newmem = {0, 0};
res = SWIG_ConvertPtrAndOwn($input, &argp, $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), %convertptr_flags, &newmem); res = SWIG_ConvertPtrAndOwn($input, &argp, $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), %convertptr_flags, &newmem);
if (!SWIG_IsOK(res)) { if (!SWIG_IsOK(res)) {
%argument_fail(res, "$type", $symname, $argnum); %argument_fail(res, "$type", $symname, $argnum);
@ -241,7 +241,7 @@
// shared_ptr by pointer // shared_ptr by pointer
%typemap(in) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > * (void *argp, int res = 0, $*1_ltype tempshared) { %typemap(in) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > * (void *argp, int res = 0, $*1_ltype tempshared) {
swig_ruby_owntype newmem = {0}; swig_ruby_owntype newmem = {0, 0};
res = SWIG_ConvertPtrAndOwn($input, &argp, $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), %convertptr_flags, &newmem); res = SWIG_ConvertPtrAndOwn($input, &argp, $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), %convertptr_flags, &newmem);
if (!SWIG_IsOK(res)) { if (!SWIG_IsOK(res)) {
%argument_fail(res, "$type", $symname, $argnum); %argument_fail(res, "$type", $symname, $argnum);
@ -269,7 +269,7 @@
// shared_ptr by pointer reference // shared_ptr by pointer reference
%typemap(in) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *& (void *argp, int res = 0, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > tempshared, $*1_ltype temp = 0) { %typemap(in) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > *& (void *argp, int res = 0, SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > tempshared, $*1_ltype temp = 0) {
swig_ruby_owntype newmem = {0}; swig_ruby_owntype newmem = {0, 0};
res = SWIG_ConvertPtrAndOwn($input, &argp, $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), %convertptr_flags, &newmem); res = SWIG_ConvertPtrAndOwn($input, &argp, $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), %convertptr_flags, &newmem);
if (!SWIG_IsOK(res)) { if (!SWIG_IsOK(res)) {
%argument_fail(res, "$type", $symname, $argnum); %argument_fail(res, "$type", $symname, $argnum);

4
Lib/ruby/director.swg
View file

@ -30,7 +30,7 @@ namespace Swig {
} }
virtual swig_ruby_owntype get_own() const { virtual swig_ruby_owntype get_own() const {
swig_ruby_owntype own = {0}; swig_ruby_owntype own = {0, 0};
return own; return own;
} }
}; };
@ -332,7 +332,7 @@ namespace Swig {
} }
swig_ruby_owntype swig_release_ownership(void *vptr) const { swig_ruby_owntype swig_release_ownership(void *vptr) const {
swig_ruby_owntype own = {0}; swig_ruby_owntype own = {0, 0};
if (vptr) { if (vptr) {
SWIG_GUARD(swig_mutex_own); SWIG_GUARD(swig_mutex_own);
swig_ownership_map::iterator iter = swig_owner.find(vptr); swig_ownership_map::iterator iter = swig_owner.find(vptr);

2
Lib/ruby/rubyrun.swg
View file

@ -245,7 +245,7 @@ typedef struct {
SWIGRUNTIME swig_ruby_owntype SWIGRUNTIME swig_ruby_owntype
SWIG_Ruby_AcquirePtr(VALUE obj, swig_ruby_owntype own) { SWIG_Ruby_AcquirePtr(VALUE obj, swig_ruby_owntype own) {
swig_ruby_owntype oldown = {0}; swig_ruby_owntype oldown = {0, 0};
if (obj) { if (obj) {
oldown.datafree = RDATA(obj)->dfree; oldown.datafree = RDATA(obj)->dfree;
RDATA(obj)->dfree = own.datafree; RDATA(obj)->dfree = own.datafree;

6
Lib/tcl/tclrun.swg
View file

@ -67,6 +67,12 @@
#define SWIG_GetConstant SWIG_GetConstantObj #define SWIG_GetConstant SWIG_GetConstantObj
#define SWIG_Tcl_GetConstant SWIG_Tcl_GetConstantObj #define SWIG_Tcl_GetConstant SWIG_Tcl_GetConstantObj
#if TCL_MAJOR_VERSION >= 8 && TCL_MINOR_VERSION >= 5
#define SWIG_TCL_HASHTABLE_INIT {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
#else
#define SWIG_TCL_HASHTABLE_INIT {0}
#endif
#include "assert.h" #include "assert.h"
#ifdef __cplusplus #ifdef __cplusplus

4
Source/Modules/octave.cxx
View file

@ -234,7 +234,7 @@ public:
} }
Printf(f_init, "return true;\n}\n"); Printf(f_init, "return true;\n}\n");
Printf(s_global_tab, "{0,0,0,0,0}\n};\n"); Printf(s_global_tab, "{0,0,0,0,0,0}\n};\n");
Printv(f_wrappers, s_global_tab, NIL); Printv(f_wrappers, s_global_tab, NIL);
SwigType_emit_type_table(f_runtime, f_wrappers); SwigType_emit_type_table(f_runtime, f_wrappers);
@ -998,7 +998,7 @@ public:
Delete(cnameshdw); Delete(cnameshdw);
} }
Printf(s_members_tab, "{0,0,0,0}\n};\n"); Printf(s_members_tab, "{0,0,0,0,0,0}\n};\n");
Printv(f_wrappers, s_members_tab, NIL); Printv(f_wrappers, s_members_tab, NIL);
String *base_class_names = NewString(""); String *base_class_names = NewString("");

2
Source/Modules/php.cxx
View file

@ -639,7 +639,7 @@ public:
Printv(f_begin, all_cs_entry, "\n\n", s_arginfo, "\n\n", s_entry, Printv(f_begin, all_cs_entry, "\n\n", s_arginfo, "\n\n", s_entry,
" SWIG_ZEND_NAMED_FE(swig_", module, "_alter_newobject,_wrap_swig_", module, "_alter_newobject,NULL)\n" " SWIG_ZEND_NAMED_FE(swig_", module, "_alter_newobject,_wrap_swig_", module, "_alter_newobject,NULL)\n"
" SWIG_ZEND_NAMED_FE(swig_", module, "_get_newobject,_wrap_swig_", module, "_get_newobject,NULL)\n" " SWIG_ZEND_NAMED_FE(swig_", module, "_get_newobject,_wrap_swig_", module, "_get_newobject,NULL)\n"
"{NULL, NULL, NULL}\n};\n\n", NIL); " ZEND_FE_END\n};\n\n", NIL);
Printv(f_begin, s_init, NIL); Printv(f_begin, s_init, NIL);
Delete(s_header); Delete(s_header);
Delete(s_wrappers); Delete(s_wrappers);

2
Source/Modules/tcl8.cxx
View file

@ -968,7 +968,7 @@ public:
Printf(f_wrappers, ",0"); Printf(f_wrappers, ",0");
} }
Printv(f_wrappers, ", swig_", mangled_classname, "_methods, swig_", mangled_classname, "_attributes, swig_", mangled_classname, "_bases,", Printv(f_wrappers, ", swig_", mangled_classname, "_methods, swig_", mangled_classname, "_attributes, swig_", mangled_classname, "_bases,",
"swig_", mangled_classname, "_base_names, &swig_module };\n", NIL); "swig_", mangled_classname, "_base_names, &swig_module, SWIG_TCL_HASHTABLE_INIT };\n", NIL);
if (!itcl) { if (!itcl) {
Printv(cmd_tab, tab4, "{ SWIG_prefix \"", class_name, "\", (swig_wrapper_func) SWIG_ObjectConstructor, (ClientData)&_wrap_class_", mangled_classname, Printv(cmd_tab, tab4, "{ SWIG_prefix \"", class_name, "\", (swig_wrapper_func) SWIG_ObjectConstructor, (ClientData)&_wrap_class_", mangled_classname,

8
Tools/testflags.py
View file

@ -3,7 +3,7 @@
def get_cflags(language, std, compiler): def get_cflags(language, std, compiler):
if std == None or len(std) == 0: if std == None or len(std) == 0:
std = "gnu89" std = "gnu89"
c_common = "-fdiagnostics-show-option -std=" + std + " -Wno-long-long -Wreturn-type -Wdeclaration-after-statement" c_common = "-fdiagnostics-show-option -std=" + std + " -Wno-long-long -Wreturn-type -Wdeclaration-after-statement -Wmissing-field-initializers"
cflags = { cflags = {
"csharp":"-Werror " + c_common, "csharp":"-Werror " + c_common,
"d":"-Werror " + c_common, "d":"-Werror " + c_common,
@ -15,7 +15,7 @@ def get_cflags(language, std, compiler):
"octave":"-Werror " + c_common, "octave":"-Werror " + c_common,
"perl5":"-Werror " + c_common, "perl5":"-Werror " + c_common,
"php":"-Werror " + c_common, "php":"-Werror " + c_common,
"python":"-Werror " + c_common + " -Wmissing-field-initializers", "python":"-Werror " + c_common,
"r":"-Werror " + c_common, "r":"-Werror " + c_common,
"ruby":"-Werror " + c_common, "ruby":"-Werror " + c_common,
"scilab":"-Werror " + c_common, "scilab":"-Werror " + c_common,
@ -32,7 +32,7 @@ def get_cflags(language, std, compiler):
def get_cxxflags(language, std, compiler): def get_cxxflags(language, std, compiler):
if std == None or len(std) == 0: if std == None or len(std) == 0:
std = "c++98" std = "c++98"
cxx_common = "-fdiagnostics-show-option -std=" + std + " -Wno-long-long -Wreturn-type" cxx_common = "-fdiagnostics-show-option -std=" + std + " -Wno-long-long -Wreturn-type -Wmissing-field-initializers"
cxxflags = { cxxflags = {
"csharp":"-Werror " + cxx_common, "csharp":"-Werror " + cxx_common,
"d":"-Werror " + cxx_common, "d":"-Werror " + cxx_common,
@ -44,7 +44,7 @@ def get_cxxflags(language, std, compiler):
"octave":"-Werror " + cxx_common, "octave":"-Werror " + cxx_common,
"perl5":"-Werror " + cxx_common, "perl5":"-Werror " + cxx_common,
"php":"-Werror " + cxx_common, "php":"-Werror " + cxx_common,
"python":"-Werror " + cxx_common + " -Wmissing-field-initializers", "python":"-Werror " + cxx_common,
"r":"-Werror " + cxx_common, "r":"-Werror " + cxx_common,
"ruby":"-Werror " + cxx_common, "ruby":"-Werror " + cxx_common,
"scilab": cxx_common, "scilab": cxx_common,