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

scilab: pointer is mapped to mlist instead of tlist (for scilab overloading)

Browse source
This commit is contained in:
Simon Marchetto 2016-09-02 11:36:02 +02:00
commit c252d5cb40
2 changed files with 11 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
CHANGES.current
View file

@ -5,6 +5,10 @@ See the RELEASENOTES file for a summary of changes in each release.
Version 3.0.11 (in progress) Version 3.0.11 (in progress)
============================ ============================
2016-09-02: smarchetto
[Scilab] Pointers are mapped to mlist instead of tlist
(mlist better for scilab overloading)
2016-09-02: olly 2016-09-02: olly
[PHP] Fix "out" typemap for member function pointers and "in" [PHP] Fix "out" typemap for member function pointers and "in"
typemap for char INPUT[ANY]. typemap for char INPUT[ANY].

14
Lib/scilab/scirun.swg
View file

@ -120,7 +120,7 @@ SwigScilabCheckPtr(void *pvApiCtx, int iVar, swig_type_info *descriptor, char *f
return SWIG_ERROR; return SWIG_ERROR;
} }
if (iType == sci_tlist) { if (iType == sci_mlist) {
int iItemCount = 0; int iItemCount = 0;
void *pvTypeinfo = NULL; void *pvTypeinfo = NULL;
@ -171,7 +171,7 @@ SwigScilabPtrToObject(void *pvApiCtx, int iVar, void **pvObj, swig_type_info *de
return SWIG_ERROR; return SWIG_ERROR;
} }
if (iType == sci_tlist) { if (iType == sci_mlist) {
int iItemCount = 0; int iItemCount = 0;
void *pvTypeinfo = NULL; void *pvTypeinfo = NULL;
@ -236,30 +236,30 @@ SwigScilabPtrFromObject(void *pvApiCtx, int iVarOut, void *pvObj, swig_type_info
SciErr sciErr; SciErr sciErr;
if (descriptor) { if (descriptor) {
int *piTListAddr = NULL; int *piMListAddr = NULL;
const char *pstString; const char *pstString;
sciErr = createTList(pvApiCtx, SWIG_NbInputArgument(pvApiCtx) + iVarOut, 3, &piTListAddr); sciErr = createMList(pvApiCtx, SWIG_NbInputArgument(pvApiCtx) + iVarOut, 3, &piMListAddr);
if (sciErr.iErr) { if (sciErr.iErr) {
printError(&sciErr, 0); printError(&sciErr, 0);
return SWIG_ERROR; return SWIG_ERROR;
} }
pstString = SWIG_TypeName(descriptor); pstString = SWIG_TypeName(descriptor);
sciErr = createMatrixOfStringInList(pvApiCtx, SWIG_NbInputArgument(pvApiCtx) + iVarOut, piTListAddr, 1, 1, 1, &pstString); sciErr = createMatrixOfStringInList(pvApiCtx, SWIG_NbInputArgument(pvApiCtx) + iVarOut, piMListAddr, 1, 1, 1, &pstString);
if (sciErr.iErr) { if (sciErr.iErr) {
printError(&sciErr, 0); printError(&sciErr, 0);
return SWIG_ERROR; return SWIG_ERROR;
} }
sciErr = createPointerInList(pvApiCtx, SWIG_NbInputArgument(pvApiCtx) + iVarOut, piTListAddr, 2, descriptor); sciErr = createPointerInList(pvApiCtx, SWIG_NbInputArgument(pvApiCtx) + iVarOut, piMListAddr, 2, descriptor);
if (sciErr.iErr) { if (sciErr.iErr) {
printError(&sciErr, 0); printError(&sciErr, 0);
return SWIG_ERROR; return SWIG_ERROR;
} }
sciErr = createPointerInList(pvApiCtx, SWIG_NbInputArgument(pvApiCtx) + iVarOut, piTListAddr, 3, pvObj); sciErr = createPointerInList(pvApiCtx, SWIG_NbInputArgument(pvApiCtx) + iVarOut, piMListAddr, 3, pvObj);
if (sciErr.iErr) { if (sciErr.iErr) {
printError(&sciErr, 0); printError(&sciErr, 0);
return SWIG_ERROR; return SWIG_ERROR;