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

Scilab: support of containers of "complex type" values (like vector<class>)

Browse source
This commit is contained in:
Simon Marchetto 2013-07-22 17:37:25 +02:00
commit c3992df0bb
2 changed files with 27 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

26
Lib/scilab/scisequence.swg
View file

@ -55,10 +55,10 @@ namespace swig {
}; };
template <typename T> struct traits_from_sequence { template <typename T> struct traits_from_sequence {
static int create(int size, void **sequence) { static int create(int size, void **sequence) {
return SWIG_FromCreate_Sequence_dec(ptr)(size, (int ***)sequence); return SWIG_FromCreate_Sequence_dec(ptr)(size, (long long **)sequence);
} }
static SciObject set(int size, void *sequence) { static SciObject set(int size, void *sequence) {
return SWIG_FromSet_Sequence_dec(ptr)(size, (int **)sequence); return SWIG_FromSet_Sequence_dec(ptr)(size, (long long *)sequence);
} }
}; };
} }
@ -107,14 +107,32 @@ namespace swig {
fragment=SWIG_From_SequenceItem_frag(ptr)) { fragment=SWIG_From_SequenceItem_frag(ptr)) {
namespace swig { namespace swig {
// Default value container conversion of item
template <typename T> struct traits_asval_sequenceitem { template <typename T> struct traits_asval_sequenceitem {
static int asval(SciObject obj, void *pSequence, int iItemIndex, T *pItemValue) { static int asval(SciObject obj, void *pSequence, int iItemIndex, T *pItemValue) {
return SWIG_AsVal_SequenceItem_dec(ptr)(obj, (int *)pSequence, iItemIndex, (int **)pItemValue); T* tmp;
int ret = SWIG_AsVal_SequenceItem_dec(ptr)(obj, (int *)pSequence, iItemIndex, (void **)&tmp);
*pItemValue = *tmp;
} }
}; };
template <typename T> struct traits_from_sequenceitem { template <typename T> struct traits_from_sequenceitem {
static int from(void *pSequence, int iItemIndex, T itemValue) { static int from(void *pSequence, int iItemIndex, T itemValue) {
return SWIG_From_SequenceItem_dec(ptr)((int **)pSequence, iItemIndex, (int*)itemValue); return SWIG_From_SequenceItem_dec(ptr)((long long *)pSequence, iItemIndex, (long long) &itemValue);
}
};
// Default pointer container conversion of item
template <typename T> struct traits_asval_sequenceitem<T*> {
static int asval(SciObject obj, void *pSequence, int iItemIndex, T **pItemValue) {
return SWIG_AsVal_SequenceItem_dec(ptr)(obj, (int *)pSequence, iItemIndex, (void **)pItemValue);
}
};
template <typename T> struct traits_from_sequenceitem<T*> {
static int from(void *pSequence, int iItemIndex, T *itemValue) {
return SWIG_From_SequenceItem_dec(ptr)((long long *)pSequence, iItemIndex, (long long) itemValue);
} }
}; };
} }

10
Lib/scilab/scisequencepointer.swg
View file

@ -36,8 +36,8 @@ SWIG_AsSize_Sequence_dec(ptr)(SciObject _obj, int *_piSize) {
%fragment(SWIG_FromCreate_Sequence_frag(ptr), "header") { %fragment(SWIG_FromCreate_Sequence_frag(ptr), "header") {
SWIGINTERN int SWIGINTERN int
SWIG_FromCreate_Sequence_dec(ptr)(int _size, int ***_sequence) { SWIG_FromCreate_Sequence_dec(ptr)(int _size, long long **_sequence) {
*_sequence = new int*[_size]; *_sequence = new long long[_size];
return *_sequence != NULL ? SWIG_OK : SWIG_ERROR; return *_sequence != NULL ? SWIG_OK : SWIG_ERROR;
} }
} }
@ -45,7 +45,7 @@ SWIG_FromCreate_Sequence_dec(ptr)(int _size, int ***_sequence) {
%fragment(SWIG_FromSet_Sequence_frag(ptr), "header") { %fragment(SWIG_FromSet_Sequence_frag(ptr), "header") {
SWIGINTERN SciObject SWIGINTERN SciObject
SWIG_FromSet_Sequence_dec(ptr)(int _size, int **_sequence) { SWIG_FromSet_Sequence_dec(ptr)(int _size, long long *_sequence) {
SciErr sciErr; SciErr sciErr;
int *piListAddr; int *piListAddr;
@ -75,7 +75,7 @@ SWIG_FromSet_Sequence_dec(ptr)(int _size, int **_sequence) {
%fragment(SWIG_AsVal_SequenceItem_frag(ptr), "header") { %fragment(SWIG_AsVal_SequenceItem_frag(ptr), "header") {
SWIGINTERN int SWIGINTERN int
SWIG_AsVal_SequenceItem_dec(ptr)(SciObject _obj, int* _piSequence, int _itemIndex, int **_pItemValue) SWIG_AsVal_SequenceItem_dec(ptr)(SciObject _obj, int *_piSequence, int _itemIndex, void **_pItemValue)
{ {
SciErr sciErr; SciErr sciErr;
int *piItemAddr; int *piItemAddr;
@ -115,7 +115,7 @@ SWIG_AsVal_SequenceItem_dec(ptr)(SciObject _obj, int* _piSequence, int _itemInde
%fragment(SWIG_From_SequenceItem_frag(ptr), "header") { %fragment(SWIG_From_SequenceItem_frag(ptr), "header") {
SWIGINTERN int SWIGINTERN int
SWIG_From_SequenceItem_dec(ptr)(int **_pSequence, int _iItemIndex, int *_itemValue) { SWIG_From_SequenceItem_dec(ptr)(long long *_pSequence, int _iItemIndex, long long _itemValue) {
_pSequence[_iItemIndex] = _itemValue; _pSequence[_iItemIndex] = _itemValue;
} }
} }