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

Zero initialize newly created arrays

Browse source 
For consistency to previous fixes:
https://github.com/swig/swig/pull/208
https://github.com/swig/swig/issues/440
This commit is contained in:
William S Fulton 2016-12-18 15:34:53 +00:00
commit cc56765a7a
3 changed files with 14 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Examples/test-suite/python/li_carrays_cpp_runme.py
View file

@ -10,6 +10,10 @@ if d[5] + d[0] != 17:
shorts = shortArray(5) shorts = shortArray(5)
sum = sum_array(shorts)
if sum != 0:
raise RuntimeError("incorrect zero sum, got: " + str(sum))
for i in range(5): for i in range(5):
shorts[i] = i shorts[i] = i

5
Examples/test-suite/python/li_carrays_runme.py
View file

@ -9,6 +9,11 @@ if d[5] + d[0] != 17:
raise RuntimeError raise RuntimeError
shorts = shortArray(5) shorts = shortArray(5)
sum = sum_array(shorts)
if sum != 0:
raise RuntimeError("incorrect zero sum, got: " + str(sum))
for i in range(5): for i in range(5):
shorts[i] = i shorts[i] = i

10
Lib/typemaps/swigmacros.swg
View file

@ -43,7 +43,7 @@
%new_instance(Type) Allocate a new instance of given Type %new_instance(Type) Allocate a new instance of given Type
%new_copy(value,Type) Allocate and initialize a new instance with 'value' %new_copy(value,Type) Allocate and initialize a new instance with 'value'
%new_array(size,Type) Allocate a new array with given size and Type %new_array(size,Type) Allocate a new array with given size and Type and zero initialize
%new_copy_array(cptr,size,Type) Allocate and initialize a new array from 'cptr' %new_copy_array(cptr,size,Type) Allocate and initialize a new array from 'cptr'
%delete(cptr) Delete an instance %delete(cptr) Delete an instance
%delete_array(cptr) Delete an array %delete_array(cptr) Delete an array
@ -159,15 +159,15 @@ nocppval
#if defined(__cplusplus) #if defined(__cplusplus)
# define %new_instance(Type...) (new Type) # define %new_instance(Type...) (new Type)
# define %new_copy(val,Type...) (new Type(%static_cast(val, const Type&))) # define %new_copy(val,Type...) (new Type(%static_cast(val, const Type&)))
# define %new_array(size,Type...) (new Type[size]) # define %new_array(size,Type...) (new Type[size]())
# define %new_copy_array(ptr,size,Type...) %reinterpret_cast(memcpy(%new_array(size,Type), ptr, sizeof(Type)*(size)), Type*) # define %new_copy_array(ptr,size,Type...) %reinterpret_cast(memcpy(new Type[size], ptr, sizeof(Type)*(size)), Type*)
# define %delete(cptr) delete cptr # define %delete(cptr) delete cptr
# define %delete_array(cptr) delete[] cptr # define %delete_array(cptr) delete[] cptr
#else /* C case */ #else /* C case */
# define %new_instance(Type...) (Type *)malloc(sizeof(Type)) # define %new_instance(Type...) (Type *)malloc(sizeof(Type))
# define %new_copy(val,Type...) (Type *)memcpy(%new_instance(Type),&val,sizeof(Type)) # define %new_copy(val,Type...) (Type *)memcpy(%new_instance(Type),&val,sizeof(Type))
# define %new_array(size,Type...) (Type *)malloc((size)*sizeof(Type)) # define %new_array(size,Type...) (Type *)calloc(size, sizeof(Type))
# define %new_copy_array(ptr,size,Type...) (Type *)memcpy(%new_array(size,Type), ptr, sizeof(Type)*(size)) # define %new_copy_array(ptr,size,Type...) (Type *)memcpy(malloc((size)*sizeof(Type)), ptr, sizeof(Type)*(size))
# define %delete(cptr) free((char*)cptr) # define %delete(cptr) free((char*)cptr)
# define %delete_array(cptr) free((char*)cptr) # define %delete_array(cptr) free((char*)cptr)
#endif /* __cplusplus */ #endif /* __cplusplus */