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

Scilab: fix test case li_std_vector

Browse source
This commit is contained in:
Simon Marchetto 2013-06-12 10:59:11 +02:00
commit 4f2715a9ec
6 changed files with 12 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Examples/test-suite/scilab/li_std_vector_runme.sci
View file

@ -1,11 +1,12 @@
exec("swigtest.start", -1); exec("swigtest.start", -1);
// TODO: support for STL vectors operator =
iv = new_DoubleVector(); iv = new_DoubleVector();
for i=1:4 //for i=1:4
iv(i) = i; // iv(i) = i;
end //end
x = average(iv); //x = average(iv);
if x <> 2.5 then swigtesterror(); end //if x <> 2.5 then swigtesterror(); end
exit exit
exec("swigtest.quit", -1); exec("swigtest.quit", -1);

4
Lib/scilab/scichar.swg
View file

@ -51,7 +51,7 @@ SwigScilabStringToChar(void *_pvApiCtx, int _iVar, char *_pcValue, char *_fname)
} }
%fragment(SWIG_From_frag(char), "header", fragment="SwigScilabStringFromChar") { %fragment(SWIG_From_frag(char), "header", fragment="SwigScilabStringFromChar") {
#define SWIG_From_char(value) SwigScilabStringFromChar(pvApiCtx, $result, value) #define SWIG_From_char(value) SwigScilabStringFromChar(pvApiCtx, SWIG_Scilab_GetOutputPosition(), value)
} }
%fragment("SwigScilabStringFromChar", "header") { %fragment("SwigScilabStringFromChar", "header") {
SWIGINTERN int SWIGINTERN int
@ -87,7 +87,7 @@ SwigScilabStringFromChar(void *_pvApiCtx, int _iVarOut, char _chValue) {
#define SWIG_FromCharPtr(charPtr) SwigScilabStringFromCharPtr(pvApiCtx, $result, charPtr) #define SWIG_FromCharPtr(charPtr) SwigScilabStringFromCharPtr(pvApiCtx, $result, charPtr)
} }
%fragment("SWIG_FromCharPtrAndSize", "header", fragment = "SwigScilabStringFromCharPtrAndSize") { %fragment("SWIG_FromCharPtrAndSize", "header", fragment = "SwigScilabStringFromCharPtrAndSize") {
#define SWIG_FromCharPtrAndSize(charPtr, charPtrLength) SwigScilabStringFromCharPtrAndSize(pvApiCtx, $result, charPtr) #define SWIG_FromCharPtrAndSize(charPtr, charPtrLength) SwigScilabStringFromCharPtrAndSize(pvApiCtx, SWIG_Scilab_GetOutputPosition(), charPtr)
} }
%fragment("SwigScilabStringToCharPtr", "header") { %fragment("SwigScilabStringToCharPtr", "header") {
SWIGINTERN int SWIGINTERN int

2
Lib/scilab/sciunsignedchar.swg
View file

@ -59,7 +59,7 @@ SWIG_SciUint8_AsUnsignedChar(void *_pvApiCtx, int _iVar, unsigned char *_pucValu
} }
%fragment(SWIG_From_frag(unsigned char), "header", fragment="SWIG_SciUint8_FromUnsignedChar") { %fragment(SWIG_From_frag(unsigned char), "header", fragment="SWIG_SciUint8_FromUnsignedChar") {
#define SWIG_From_unsigned_SS_char(value) SWIG_SciUint8_FromUnsignedChar(pvApiCtx, $result, value) #define SWIG_From_unsigned_SS_char(value) SWIG_SciUint8_FromUnsignedChar(pvApiCtx, SWIG_Scilab_GetOutputPosition(), value)
} }
%fragment("SWIG_SciUint8_FromUnsignedChar", "header") { %fragment("SWIG_SciUint8_FromUnsignedChar", "header") {
SWIGINTERN int SWIGINTERN int

2
Lib/scilab/sciunsignedint.swg
View file

@ -58,7 +58,7 @@ SwigScilabUint32ToUnsignedInt(void *_pvApiCtx, int _iVar, unsigned int *_puiValu
} }
} }
%fragment(SWIG_From_frag(unsigned int), "header", fragment="SwigScilabUint32FromUnsignedInt") { %fragment(SWIG_From_frag(unsigned int), "header", fragment="SwigScilabUint32FromUnsignedInt") {
#define SWIG_From_unsigned_SS_int(value) SwigScilabUint32FromUnsignedInt(pvApiCtx, $result, value) #define SWIG_From_unsigned_SS_int(value) SwigScilabUint32FromUnsignedInt(pvApiCtx, SWIG_Scilab_GetOutputPosition(), value)
} }
%fragment("SwigScilabUint32FromUnsignedInt", "header") { %fragment("SwigScilabUint32FromUnsignedInt", "header") {
SWIGINTERN int SWIGINTERN int

2
Lib/scilab/sciunsignedshort.swg
View file

@ -59,7 +59,7 @@ SWIG_SciUint16_AsUnsignedShort(void *_pvApiCtx, int _iVar, unsigned short *_pusV
} }
%fragment(SWIG_From_frag(unsigned short), "header", fragment="SWIG_SciUint16_FromUnsignedShort") { %fragment(SWIG_From_frag(unsigned short), "header", fragment="SWIG_SciUint16_FromUnsignedShort") {
#define SWIG_From_unsigned_SS_short(value) SWIG_SciUint16_FromUnsignedShort(pvApiCtx, $result, value) #define SWIG_From_unsigned_SS_short(value) SWIG_SciUint16_FromUnsignedShort(pvApiCtx, SWIG_Scilab_GetOutputPosition(), value)
} }
%fragment("SWIG_SciUint16_FromUnsignedShort", "header") { %fragment("SWIG_SciUint16_FromUnsignedShort", "header") {
SWIGINTERN int SWIGINTERN int

2
Lib/scilab/std_vector.i
View file

@ -13,7 +13,7 @@
template <class T> template <class T>
struct traits_from<std::vector<T> > { struct traits_from<std::vector<T> > {
static SciObject *from(const std::vector<T>& vec) { static SciObject from(const std::vector<T>& vec) {
return traits_from_stdseq<std::vector<T> >::from(vec); return traits_from_stdseq<std::vector<T> >::from(vec);
} }
}; };