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

Scilab: fix prefix SciObject

Browse source
This commit is contained in:
Simon Marchetto 2013-09-23 09:57:12 +02:00
commit b7064539d0
21 changed files with 117 additions and 117 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Lib/scilab/scibool.swg
View file

@ -4,7 +4,7 @@
*/ */
%fragment(SWIG_AsVal_frag(bool), "header") { %fragment(SWIG_AsVal_frag(bool), "header") {
SWIGINTERN int SWIGINTERN int
SWIG_AsVal_dec(bool)(SciObject _iVar, bool *_pbValue) { SWIG_AsVal_dec(bool)(SwigSciObject _iVar, bool *_pbValue) {
SciErr sciErr; SciErr sciErr;
int iRet = 0; int iRet = 0;
int *piAddrVar = NULL; int *piAddrVar = NULL;

20
Lib/scilab/scicontainer.swg
View file

@ -50,7 +50,7 @@ namespace swig
template <class T> template <class T>
struct SciSequence_Ref struct SciSequence_Ref
{ {
SciSequence_Ref(const SciObject& seq, int index) SciSequence_Ref(const SwigSciObject& seq, int index)
: _seq(seq), _index(index) : _seq(seq), _index(index)
{ {
if (traits_as_sequence<T>::get(_seq, &_piSeqAddr) != SWIG_OK) if (traits_as_sequence<T>::get(_seq, &_piSeqAddr) != SWIG_OK)
@ -83,7 +83,7 @@ namespace swig
} }
private: private:
SciObject _seq; SwigSciObject _seq;
int _index; int _index;
void *_piSeqAddr; void *_piSeqAddr;
}; };
@ -113,7 +113,7 @@ namespace swig
{ {
} }
SciSequence_InputIterator(const SciObject& seq, int index) SciSequence_InputIterator(const SwigSciObject& seq, int index)
: _seq(seq), _index(index) : _seq(seq), _index(index)
{ {
} }
@ -189,7 +189,7 @@ namespace swig
} }
private: private:
SciObject _seq; SwigSciObject _seq;
difference_type _index; difference_type _index;
}; };
@ -206,7 +206,7 @@ namespace swig
typedef SciSequence_InputIterator<T, reference> iterator; typedef SciSequence_InputIterator<T, reference> iterator;
typedef SciSequence_InputIterator<T, const_reference> const_iterator; typedef SciSequence_InputIterator<T, const_reference> const_iterator;
SciSequence_Cont(const SciObject& seq) : _seq(seq) SciSequence_Cont(const SwigSciObject& seq) : _seq(seq)
{ {
} }
@ -263,7 +263,7 @@ namespace swig
} }
private: private:
SciObject _seq; SwigSciObject _seq;
}; };
} }
} }
@ -297,7 +297,7 @@ namespace swig
reverse_iterator(swig::SciSwigIterator *iter = 0, int res), reverse_iterator(swig::SciSwigIterator *iter = 0, int res),
const_iterator(swig::SciSwigIterator *iter = 0, int res), const_iterator(swig::SciSwigIterator *iter = 0, int res),
const_reverse_iterator(swig::SciSwigIterator *iter = 0, int res) { const_reverse_iterator(swig::SciSwigIterator *iter = 0, int res) {
res = SWIG_ConvertPtr((SciObject)$input, %as_voidptrptr(&iter), swig::SciSwigIterator::descriptor(), 0); res = SWIG_ConvertPtr((SwigSciObject)$input, %as_voidptrptr(&iter), swig::SciSwigIterator::descriptor(), 0);
if (!SWIG_IsOK(res) || !iter) { if (!SWIG_IsOK(res) || !iter) {
%argument_fail(SWIG_TypeError, "$type", $symname, $argnum); %argument_fail(SWIG_TypeError, "$type", $symname, $argnum);
} else { } else {
@ -313,7 +313,7 @@ namespace swig
%typecheck(%checkcode(ITERATOR),noblock=1,fragment="SciSequence_Cont") %typecheck(%checkcode(ITERATOR),noblock=1,fragment="SciSequence_Cont")
iterator, reverse_iterator, const_iterator, const_reverse_iterator { iterator, reverse_iterator, const_iterator, const_reverse_iterator {
swig::SciSwigIterator *iter = 0; swig::SciSwigIterator *iter = 0;
int res = SWIG_ConvertPtr((SciObject)$input, %as_voidptrptr(&iter), swig::SciSwigIterator::descriptor(), 0); int res = SWIG_ConvertPtr((SwigSciObject)$input, %as_voidptrptr(&iter), swig::SciSwigIterator::descriptor(), 0);
$1 = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::SciSwigIterator_T<$type > *>(iter) != 0)); $1 = (SWIG_IsOK(res) && iter && (dynamic_cast<swig::SciSwigIterator_T<$type > *>(iter) != 0));
} }
@ -369,7 +369,7 @@ namespace swig {
typedef Seq sequence; typedef Seq sequence;
typedef T value_type; typedef T value_type;
static int asptr(const SciObject& obj, sequence **seq) static int asptr(const SwigSciObject& obj, sequence **seq)
{ {
swig_type_info *typeInfo = swig::type_info<sequence>(); swig_type_info *typeInfo = swig::type_info<sequence>();
if (typeInfo) if (typeInfo)
@ -414,7 +414,7 @@ namespace swig {
typedef typename Seq::size_type size_type; typedef typename Seq::size_type size_type;
typedef typename sequence::const_iterator const_iterator; typedef typename sequence::const_iterator const_iterator;
static SciObject from(const sequence& seq) static SwigSciObject from(const sequence& seq)
{ {
%#ifdef SWIG_SCILAB_EXTRA_NATIVE_CONTAINERS %#ifdef SWIG_SCILAB_EXTRA_NATIVE_CONTAINERS
swig_type_info *typeInfo = swig::type_info<sequence>(); swig_type_info *typeInfo = swig::type_info<sequence>();

2
Lib/scilab/scidouble.swg
View file

@ -3,7 +3,7 @@
*/ */
%fragment(SWIG_AsVal_frag(double), "header") { %fragment(SWIG_AsVal_frag(double), "header") {
SWIGINTERN int SWIGINTERN int
SWIG_AsVal_dec(double)(SciObject _iVar, double *_pdblValue) { SWIG_AsVal_dec(double)(SwigSciObject _iVar, double *_pdblValue) {
SciErr sciErr; SciErr sciErr;
int iRet = 0; int iRet = 0;
int *piAddrVar = NULL; int *piAddrVar = NULL;

2
Lib/scilab/scifloat.swg
View file

@ -3,7 +3,7 @@
*/ */
%fragment(SWIG_AsVal_frag(float), "header", fragment=SWIG_AsVal_frag(double)) { %fragment(SWIG_AsVal_frag(float), "header", fragment=SWIG_AsVal_frag(double)) {
SWIGINTERN int SWIGINTERN int
SWIG_AsVal_dec(float)(SciObject _iVar, float *_pfValue) { SWIG_AsVal_dec(float)(SwigSciObject _iVar, float *_pfValue) {
double dblValue = 0.0; double dblValue = 0.0;
if(SWIG_AsVal_dec(double)(_iVar, &dblValue) != SWIG_OK) { if(SWIG_AsVal_dec(double)(_iVar, &dblValue) != SWIG_OK) {
return SWIG_ERROR; return SWIG_ERROR;

4
Lib/scilab/sciint.swg
View file

@ -4,7 +4,7 @@
*/ */
%fragment(SWIG_AsVal_frag(int), "header") { %fragment(SWIG_AsVal_frag(int), "header") {
SWIGINTERN int SWIGINTERN int
SWIG_AsVal_dec(int)(SciObject _iVar, int *_piValue) SWIG_AsVal_dec(int)(SwigSciObject _iVar, int *_piValue)
{ {
SciErr sciErr; SciErr sciErr;
int iRet = 0; int iRet = 0;
@ -71,7 +71,7 @@ SWIG_AsVal_dec(int)(SciObject _iVar, int *_piValue)
} }
%fragment(SWIG_AsVal_frag(size_t), "header", fragment=SWIG_AsVal_frag(int)) { %fragment(SWIG_AsVal_frag(size_t), "header", fragment=SWIG_AsVal_frag(int)) {
SWIGINTERN int SWIGINTERN int
SWIG_AsVal_dec(size_t)(SciObject _iVar, size_t *_piValue) SWIG_AsVal_dec(size_t)(SwigSciObject _iVar, size_t *_piValue)
{ {
int iValue = 0; int iValue = 0;
if (SWIG_AsVal_dec(int)(_iVar, &iValue) != SWIG_OK) if (SWIG_AsVal_dec(int)(_iVar, &iValue) != SWIG_OK)

36
Lib/scilab/sciiterators.swg
View file

@ -16,17 +16,17 @@ namespace swig {
struct SciSwigIterator { struct SciSwigIterator {
private: private:
SciObject _seq; SwigSciObject _seq;
protected: protected:
SciSwigIterator(SciObject seq) : _seq(seq) SciSwigIterator(SwigSciObject seq) : _seq(seq)
{ {
} }
public: public:
virtual ~SciSwigIterator() {} virtual ~SciSwigIterator() {}
virtual SciObject value() const = 0; virtual SwigSciObject value() const = 0;
virtual SciSwigIterator *incr(size_t n = 1) = 0; virtual SciSwigIterator *incr(size_t n = 1) = 0;
@ -47,14 +47,14 @@ namespace swig {
virtual SciSwigIterator *copy() const = 0; virtual SciSwigIterator *copy() const = 0;
SciObject next() SwigSciObject next()
{ {
SciObject obj = value(); SwigSciObject obj = value();
incr(); incr();
return obj; return obj;
} }
SciObject previous() SwigSciObject previous()
{ {
decr(); decr();
return value(); return value();
@ -123,7 +123,7 @@ namespace swig {
typedef typename std::iterator_traits<out_iterator>::value_type value_type; typedef typename std::iterator_traits<out_iterator>::value_type value_type;
typedef SciSwigIterator_T<out_iterator> self_type; typedef SciSwigIterator_T<out_iterator> self_type;
SciSwigIterator_T(out_iterator curr, SciObject seq) SciSwigIterator_T(out_iterator curr, SwigSciObject seq)
: SciSwigIterator(seq), current(curr) : SciSwigIterator(seq), current(curr)
{ {
} }
@ -162,7 +162,7 @@ namespace swig {
struct from_oper struct from_oper
{ {
typedef const ValueType& argument_type; typedef const ValueType& argument_type;
typedef SciObject result_type; typedef SwigSciObject result_type;
result_type operator()(argument_type v) const result_type operator()(argument_type v) const
{ {
return swig::from(v); return swig::from(v);
@ -181,12 +181,12 @@ namespace swig {
typedef SciSwigIterator_T<out_iterator> base; typedef SciSwigIterator_T<out_iterator> base;
typedef SciSwigIteratorOpen_T<OutIterator, ValueType, FromOper> self_type; typedef SciSwigIteratorOpen_T<OutIterator, ValueType, FromOper> self_type;
SciSwigIteratorOpen_T(out_iterator curr, SciObject seq) SciSwigIteratorOpen_T(out_iterator curr, SwigSciObject seq)
: SciSwigIterator_T<OutIterator>(curr, seq) : SciSwigIterator_T<OutIterator>(curr, seq)
{ {
} }
SciObject value() const { SwigSciObject value() const {
return from(static_cast<const value_type&>(*(base::current))); return from(static_cast<const value_type&>(*(base::current)));
} }
@ -224,12 +224,12 @@ namespace swig {
typedef SciSwigIterator_T<out_iterator> base; typedef SciSwigIterator_T<out_iterator> base;
typedef SciSwigIteratorClosed_T<OutIterator, ValueType, FromOper> self_type; typedef SciSwigIteratorClosed_T<OutIterator, ValueType, FromOper> self_type;
SciSwigIteratorClosed_T(out_iterator curr, out_iterator first, out_iterator last, SciObject seq) SciSwigIteratorClosed_T(out_iterator curr, out_iterator first, out_iterator last, SwigSciObject seq)
: SciSwigIterator_T<OutIterator>(curr, seq), begin(first), end(last) : SciSwigIterator_T<OutIterator>(curr, seq), begin(first), end(last)
{ {
} }
SciObject value() const { SwigSciObject value() const {
if (base::current == end) { if (base::current == end) {
throw stop_iteration(); throw stop_iteration();
} else { } else {
@ -273,14 +273,14 @@ namespace swig {
template<typename OutIter> template<typename OutIter>
inline SciSwigIterator* inline SciSwigIterator*
make_output_iterator(const OutIter& current, const OutIter& begin,const OutIter& end, SciObject seq = SciObject()) make_output_iterator(const OutIter& current, const OutIter& begin,const OutIter& end, SwigSciObject seq = SwigSciObject())
{ {
return new SciSwigIteratorClosed_T<OutIter>(current, begin, end, seq); return new SciSwigIteratorClosed_T<OutIter>(current, begin, end, seq);
} }
template<typename OutIter> template<typename OutIter>
inline SciSwigIterator* inline SciSwigIterator*
make_output_iterator(const OutIter& current, SciObject seq = SciObject()) make_output_iterator(const OutIter& current, SwigSciObject seq = SwigSciObject())
{ {
return new SciSwigIteratorOpen_T<OutIter>(current, seq); return new SciSwigIteratorOpen_T<OutIter>(current, seq);
} }
@ -331,12 +331,12 @@ namespace swig
struct SciSwigIterator struct SciSwigIterator
{ {
protected: protected:
SciSwigIterator(SciObject seq); SciSwigIterator(SwigSciObject seq);
public: public:
virtual ~SciSwigIterator(); virtual ~SciSwigIterator();
virtual SciObject value() const = 0; virtual SwigSciObject value() const = 0;
virtual SciSwigIterator *incr(size_t n = 1) = 0; virtual SciSwigIterator *incr(size_t n = 1) = 0;
@ -348,8 +348,8 @@ namespace swig
virtual SciSwigIterator *copy() const = 0; virtual SciSwigIterator *copy() const = 0;
SciObject next(); SwigSciObject next();
SciObject previous(); SwigSciObject previous();
SciSwigIterator *advance(ptrdiff_t n); SciSwigIterator *advance(ptrdiff_t n);
bool operator == (const SciSwigIterator& x) const; bool operator == (const SciSwigIterator& x) const;

8
Lib/scilab/scilist.swg
View file

@ -6,7 +6,7 @@
%fragment("SWIG_ScilabList", "header") %fragment("SWIG_ScilabList", "header")
{ {
SWIGINTERN int SWIGINTERN int
SWIG_GetScilabList(SciObject _obj, int **_piListAddr) SWIG_GetScilabList(SwigSciObject _obj, int **_piListAddr)
{ {
SciErr sciErr; SciErr sciErr;
@ -21,7 +21,7 @@ SWIG_GetScilabList(SciObject _obj, int **_piListAddr)
} }
SWIGINTERN int SWIGINTERN int
SWIG_GetScilabListSize(SciObject _obj, int *_piListSize) SWIG_GetScilabListSize(SwigSciObject _obj, int *_piListSize)
{ {
SciErr sciErr; SciErr sciErr;
int *piListAddr; int *piListAddr;
@ -44,7 +44,7 @@ SWIG_GetScilabListSize(SciObject _obj, int *_piListSize)
} }
SWIGINTERN int SWIGINTERN int
SWIG_GetScilabListAndSize(SciObject _obj, int **_piListAddr, int *_piListSize) SWIG_GetScilabListAndSize(SwigSciObject _obj, int **_piListAddr, int *_piListSize)
{ {
SciErr sciErr; SciErr sciErr;
@ -66,7 +66,7 @@ SWIG_GetScilabListAndSize(SciObject _obj, int **_piListAddr, int *_piListSize)
} }
SWIGINTERN int SWIGINTERN int
SWIG_CheckScilabList(SciObject _obj) SWIG_CheckScilabList(SwigSciObject _obj)
{ {
SciErr sciErr; SciErr sciErr;
int *piListAddr; int *piListAddr;

4
Lib/scilab/scilong.swg
View file

@ -4,7 +4,7 @@
*/ */
%fragment(SWIG_AsVal_frag(long), "header", fragment=SWIG_AsVal_frag(double)) { %fragment(SWIG_AsVal_frag(long), "header", fragment=SWIG_AsVal_frag(double)) {
SWIGINTERN int SWIGINTERN int
SWIG_AsVal_dec(long)(SciObject _iVar, long *_plValue) { SWIG_AsVal_dec(long)(SwigSciObject _iVar, long *_plValue) {
double dblValue = 0.0; double dblValue = 0.0;
if(SWIG_AsVal_dec(double)(_iVar, &dblValue) != SWIG_OK) { if(SWIG_AsVal_dec(double)(_iVar, &dblValue) != SWIG_OK) {
return SWIG_ERROR; return SWIG_ERROR;
@ -39,7 +39,7 @@ SWIG_From_dec(long)(long _lValue) {
*/ */
%fragment(SWIG_AsVal_frag(unsigned long), "header", fragment=SWIG_AsVal_frag(double)) { %fragment(SWIG_AsVal_frag(unsigned long), "header", fragment=SWIG_AsVal_frag(double)) {
SWIGINTERN int SWIGINTERN int
SWIG_AsVal_dec(unsigned long)(SciObject _iVar, unsigned long *_pulValue) { SWIG_AsVal_dec(unsigned long)(SwigSciObject _iVar, unsigned long *_pulValue) {
double dblValue = 0.0; double dblValue = 0.0;
if(SWIG_AsVal_dec(double)(_iVar, &dblValue) != SWIG_OK) { if(SWIG_AsVal_dec(double)(_iVar, &dblValue) != SWIG_OK) {
return SWIG_ERROR; return SWIG_ERROR;

4
Lib/scilab/sciruntime.swg
View file

@ -23,7 +23,7 @@ extern "C" {
#undef Max #undef Max
#undef Min #undef Min
typedef int SciObject; typedef int SwigSciObject;
/* ----------------------------------------------------------------------------- /* -----------------------------------------------------------------------------
@ -225,7 +225,7 @@ SWIG_Scilab_NewMemberObj(void *_pvApiCtx, int _iVarOut, void *_ptr, int _sz, swi
} }
SWIGRUNTIME int SWIGRUNTIME int
SWIG_Scilab_SetOutput(void *_pvApiCtx, SciObject _output) { SWIG_Scilab_SetOutput(void *_pvApiCtx, SwigSciObject _output) {
int outputPosition = SWIG_Scilab_GetOutputPositionAndReset(); int outputPosition = SWIG_Scilab_GetOutputPositionAndReset();
if (outputPosition < 0 || _output < 0) { if (outputPosition < 0 || _output < 0) {
return SWIG_ERROR; return SWIG_ERROR;

30
Lib/scilab/scisequence.swg
View file

@ -50,13 +50,13 @@ namespace swig {
// For sequence of values, considers int as default type (so it works for enums) // For sequence of values, considers int as default type (so it works for enums)
template <typename T> struct traits_as_sequence { template <typename T> struct traits_as_sequence {
static int check(SciObject obj) { static int check(SwigSciObject obj) {
return SWIG_AsCheck_Sequence_dec(int)(obj); return SWIG_AsCheck_Sequence_dec(int)(obj);
} }
static int get(SciObject obj, void **sequence) { static int get(SwigSciObject obj, void **sequence) {
return SWIG_AsGet_Sequence_dec(int)(obj, (int **)sequence); return SWIG_AsGet_Sequence_dec(int)(obj, (int **)sequence);
} }
static int size(SciObject obj, int *size) { static int size(SwigSciObject obj, int *size) {
return SWIG_AsSize_Sequence_dec(int)(obj, size); return SWIG_AsSize_Sequence_dec(int)(obj, size);
} }
}; };
@ -64,7 +64,7 @@ namespace swig {
static int create(int size, void **sequence) { static int create(int size, void **sequence) {
return SWIG_FromCreate_Sequence_dec(int)(size, (int **)sequence); return SWIG_FromCreate_Sequence_dec(int)(size, (int **)sequence);
} }
static SciObject set(int size, void *sequence) { static SwigSciObject set(int size, void *sequence) {
return SWIG_FromSet_Sequence_dec(int)(size, (int *)sequence); return SWIG_FromSet_Sequence_dec(int)(size, (int *)sequence);
} }
}; };
@ -72,13 +72,13 @@ namespace swig {
// For sequence of pointers // For sequence of pointers
template <typename T> struct traits_as_sequence<T*> { template <typename T> struct traits_as_sequence<T*> {
static int check(SciObject obj) { static int check(SwigSciObject obj) {
return SWIG_AsCheck_Sequence_dec(ptr)(obj); return SWIG_AsCheck_Sequence_dec(ptr)(obj);
} }
static int get(SciObject obj, void **sequence) { static int get(SwigSciObject obj, void **sequence) {
return SWIG_AsGet_Sequence_dec(ptr)(obj, (int **)sequence); return SWIG_AsGet_Sequence_dec(ptr)(obj, (int **)sequence);
} }
static int size(SciObject obj, int *size) { static int size(SwigSciObject obj, int *size) {
return SWIG_AsSize_Sequence_dec(ptr)(obj, size); return SWIG_AsSize_Sequence_dec(ptr)(obj, size);
} }
}; };
@ -86,7 +86,7 @@ namespace swig {
static int create(int size, void **sequence) { static int create(int size, void **sequence) {
return SWIG_FromCreate_Sequence_dec(ptr)(size, (long long **)sequence); return SWIG_FromCreate_Sequence_dec(ptr)(size, (long long **)sequence);
} }
static SciObject set(int size, void *sequence) { static SwigSciObject set(int size, void *sequence) {
return SWIG_FromSet_Sequence_dec(ptr)(size, (long long *)sequence); return SWIG_FromSet_Sequence_dec(ptr)(size, (long long *)sequence);
} }
}; };
@ -104,13 +104,13 @@ namespace swig {
namespace swig { namespace swig {
template <> struct traits_as_sequence<CppType > { template <> struct traits_as_sequence<CppType > {
static int check(SciObject obj) { static int check(SwigSciObject obj) {
return SWIG_AsCheck_Sequence_dec(CppType)(obj); return SWIG_AsCheck_Sequence_dec(CppType)(obj);
} }
static int get(SciObject obj, void **sequence) { static int get(SwigSciObject obj, void **sequence) {
return SWIG_AsGet_Sequence_dec(CppType)(obj, (ScilabType **)sequence); return SWIG_AsGet_Sequence_dec(CppType)(obj, (ScilabType **)sequence);
} }
static int size(SciObject obj, int *size) { static int size(SwigSciObject obj, int *size) {
return SWIG_AsSize_Sequence_dec(CppType)(obj, size); return SWIG_AsSize_Sequence_dec(CppType)(obj, size);
} }
}; };
@ -118,7 +118,7 @@ namespace swig {
static int create(int size, void **sequence) { static int create(int size, void **sequence) {
return SWIG_FromCreate_Sequence_dec(CppType)(size, (ScilabType **)sequence); return SWIG_FromCreate_Sequence_dec(CppType)(size, (ScilabType **)sequence);
} }
static SciObject set(int size, void *sequence) { static SwigSciObject set(int size, void *sequence) {
return SWIG_FromSet_Sequence_dec(CppType)(size, (ScilabType *)sequence); return SWIG_FromSet_Sequence_dec(CppType)(size, (ScilabType *)sequence);
} }
}; };
@ -142,7 +142,7 @@ namespace swig {
// For sequence of values, considers int as default type (so it works for enums) // For sequence of values, considers int as default type (so it works for enums)
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(SwigSciObject obj, void *pSequence, int iItemIndex, T *pItemValue) {
return SWIG_AsVal_SequenceItem_dec(int)(obj, (int *)pSequence, iItemIndex, (int *)pItemValue); return SWIG_AsVal_SequenceItem_dec(int)(obj, (int *)pSequence, iItemIndex, (int *)pItemValue);
} }
}; };
@ -155,7 +155,7 @@ namespace swig {
// Sequence of pointers // Sequence of pointers
template <typename T> struct traits_asval_sequenceitem<T*> { template <typename T> struct traits_asval_sequenceitem<T*> {
static int asval(SciObject obj, void *pSequence, int iItemIndex, T **pItemValue) { static int asval(SwigSciObject obj, void *pSequence, int iItemIndex, T **pItemValue) {
return SWIG_AsVal_SequenceItem_dec(ptr)(obj, (int *)pSequence, iItemIndex, (void **)pItemValue); return SWIG_AsVal_SequenceItem_dec(ptr)(obj, (int *)pSequence, iItemIndex, (void **)pItemValue);
} }
}; };
@ -175,7 +175,7 @@ namespace swig {
namespace swig { namespace swig {
template <> struct traits_asval_sequenceitem<CppType > { template <> struct traits_asval_sequenceitem<CppType > {
static int asval(SciObject obj, void *pSequence, int iItemIndex, CppType *pItemValue) { static int asval(SwigSciObject obj, void *pSequence, int iItemIndex, CppType *pItemValue) {
return SWIG_AsVal_SequenceItem_dec(CppType)(obj, (ScilabType *)pSequence, iItemIndex, pItemValue); return SWIG_AsVal_SequenceItem_dec(CppType)(obj, (ScilabType *)pSequence, iItemIndex, pItemValue);
} }
}; };

12
Lib/scilab/scisequencebool.swg
View file

@ -10,7 +10,7 @@
fragment="SWIG_SciInt32_AsIntArrayAndSize") { fragment="SWIG_SciInt32_AsIntArrayAndSize") {
SWIGINTERN int SWIGINTERN int
SWIG_AsCheck_Sequence_dec(bool)(SciObject _obj) { SWIG_AsCheck_Sequence_dec(bool)(SwigSciObject _obj) {
SciErr sciErr; SciErr sciErr;
int *piAddrVar; int *piAddrVar;
@ -36,7 +36,7 @@ SWIG_AsCheck_Sequence_dec(bool)(SciObject _obj) {
fragment="SWIG_SciBoolean_AsIntArrayAndSize") { fragment="SWIG_SciBoolean_AsIntArrayAndSize") {
SWIGINTERN int SWIGINTERN int
SWIG_AsGet_Sequence_dec(bool)(SciObject _obj, int **_pSequence) { SWIG_AsGet_Sequence_dec(bool)(SwigSciObject _obj, int **_pSequence) {
int iMatrixRowCount; int iMatrixRowCount;
int iMatrixColCount; int iMatrixColCount;
return (SWIG_SciBoolean_AsIntArrayAndSize(pvApiCtx, _obj, &iMatrixRowCount, &iMatrixColCount, _pSequence, SWIG_Scilab_GetFname())); return (SWIG_SciBoolean_AsIntArrayAndSize(pvApiCtx, _obj, &iMatrixRowCount, &iMatrixColCount, _pSequence, SWIG_Scilab_GetFname()));
@ -47,7 +47,7 @@ SWIG_AsGet_Sequence_dec(bool)(SciObject _obj, int **_pSequence) {
fragment="SWIG_SciBoolean_AsIntArrayAndSize") { fragment="SWIG_SciBoolean_AsIntArrayAndSize") {
SWIGINTERN int SWIGINTERN int
SWIG_AsSize_Sequence_dec(bool)(SciObject _obj, int *_piSize) { SWIG_AsSize_Sequence_dec(bool)(SwigSciObject _obj, int *_piSize) {
int *piMatrix; int *piMatrix;
int iMatrixRowCount; int iMatrixRowCount;
int iMatrixColCount; int iMatrixColCount;
@ -75,9 +75,9 @@ SWIG_FromCreate_Sequence_dec(bool)(int _size, int **_sequence) {
%fragment(SWIG_FromSet_Sequence_frag(bool), "header", %fragment(SWIG_FromSet_Sequence_frag(bool), "header",
fragment="SWIG_SciBoolean_FromIntArrayAndSize") { fragment="SWIG_SciBoolean_FromIntArrayAndSize") {
SWIGINTERN SciObject SWIGINTERN SwigSciObject
SWIG_FromSet_Sequence_dec(bool)(int _size, int *_sequence) { SWIG_FromSet_Sequence_dec(bool)(int _size, int *_sequence) {
SciObject obj = SWIG_SciBoolean_FromIntArrayAndSize(pvApiCtx, SWIG_Scilab_GetOutputPosition(), 1, _size, _sequence); SwigSciObject obj = SWIG_SciBoolean_FromIntArrayAndSize(pvApiCtx, SWIG_Scilab_GetOutputPosition(), 1, _size, _sequence);
delete (int *)_sequence; delete (int *)_sequence;
return obj; return obj;
} }
@ -86,7 +86,7 @@ SWIG_FromSet_Sequence_dec(bool)(int _size, int *_sequence) {
%fragment(SWIG_AsVal_SequenceItem_frag(bool), "header") { %fragment(SWIG_AsVal_SequenceItem_frag(bool), "header") {
SWIGINTERN int SWIGINTERN int
SWIG_AsVal_SequenceItem_dec(bool)(SciObject _obj, int *_pSequence, int _iItemIndex, bool *_pItemValue) { SWIG_AsVal_SequenceItem_dec(bool)(SwigSciObject _obj, int *_pSequence, int _iItemIndex, bool *_pItemValue) {
*_pItemValue = _pSequence[_iItemIndex]; *_pItemValue = _pSequence[_iItemIndex];
return SWIG_OK; return SWIG_OK;
} }

12
Lib/scilab/scisequencedouble.swg
View file

@ -10,7 +10,7 @@
fragment="SWIG_SciDouble_AsDoubleArrayAndSize") { fragment="SWIG_SciDouble_AsDoubleArrayAndSize") {
SWIGINTERN int SWIGINTERN int
SWIG_AsCheck_Sequence_dec(double)(SciObject _obj) { SWIG_AsCheck_Sequence_dec(double)(SwigSciObject _obj) {
SciErr sciErr; SciErr sciErr;
int *piAddrVar; int *piAddrVar;
@ -36,7 +36,7 @@ SWIG_AsCheck_Sequence_dec(double)(SciObject _obj) {
fragment="SWIG_SciDouble_AsDoubleArrayAndSize") { fragment="SWIG_SciDouble_AsDoubleArrayAndSize") {
SWIGINTERN int SWIGINTERN int
SWIG_AsGet_Sequence_dec(double)(SciObject _obj, double **_pSequence) { SWIG_AsGet_Sequence_dec(double)(SwigSciObject _obj, double **_pSequence) {
int iMatrixRowCount; int iMatrixRowCount;
int iMatrixColCount; int iMatrixColCount;
return (SWIG_SciDouble_AsDoubleArrayAndSize(pvApiCtx, _obj, &iMatrixRowCount, &iMatrixColCount, _pSequence, SWIG_Scilab_GetFname())); return (SWIG_SciDouble_AsDoubleArrayAndSize(pvApiCtx, _obj, &iMatrixRowCount, &iMatrixColCount, _pSequence, SWIG_Scilab_GetFname()));
@ -47,7 +47,7 @@ SWIG_AsGet_Sequence_dec(double)(SciObject _obj, double **_pSequence) {
fragment="SWIG_SciDouble_AsDoubleArrayAndSize") { fragment="SWIG_SciDouble_AsDoubleArrayAndSize") {
SWIGINTERN int SWIGINTERN int
SWIG_AsSize_Sequence_dec(double)(SciObject _obj, int *_piSize) { SWIG_AsSize_Sequence_dec(double)(SwigSciObject _obj, int *_piSize) {
double *pdblMatrix; double *pdblMatrix;
int iMatrixRowCount; int iMatrixRowCount;
int iMatrixColCount; int iMatrixColCount;
@ -75,9 +75,9 @@ SWIG_FromCreate_Sequence_dec(double)(int _size, double **_sequence) {
%fragment(SWIG_FromSet_Sequence_frag(double), "header", %fragment(SWIG_FromSet_Sequence_frag(double), "header",
fragment="SWIG_SciDouble_FromDoubleArrayAndSize") { fragment="SWIG_SciDouble_FromDoubleArrayAndSize") {
SWIGINTERN SciObject SWIGINTERN SwigSciObject
SWIG_FromSet_Sequence_dec(double)(int _size, double *_sequence) { SWIG_FromSet_Sequence_dec(double)(int _size, double *_sequence) {
SciObject obj = SWIG_SciDouble_FromDoubleArrayAndSize(pvApiCtx, SWIG_Scilab_GetOutputPosition(), 1, _size, _sequence); SwigSciObject obj = SWIG_SciDouble_FromDoubleArrayAndSize(pvApiCtx, SWIG_Scilab_GetOutputPosition(), 1, _size, _sequence);
delete (double *)_sequence; delete (double *)_sequence;
return obj; return obj;
} }
@ -86,7 +86,7 @@ SWIG_FromSet_Sequence_dec(double)(int _size, double *_sequence) {
%fragment(SWIG_AsVal_SequenceItem_frag(double), "header") { %fragment(SWIG_AsVal_SequenceItem_frag(double), "header") {
SWIGINTERN int SWIGINTERN int
SWIG_AsVal_SequenceItem_dec(double)(SciObject _obj, double *_pSequence, int _iItemIndex, double *_pItemValue) { SWIG_AsVal_SequenceItem_dec(double)(SwigSciObject _obj, double *_pSequence, int _iItemIndex, double *_pItemValue) {
*_pItemValue = _pSequence[_iItemIndex]; *_pItemValue = _pSequence[_iItemIndex];
return SWIG_OK; return SWIG_OK;
} }

12
Lib/scilab/scisequenceint.swg
View file

@ -10,7 +10,7 @@
fragment="SWIG_SciInt32_AsIntArrayAndSize") { fragment="SWIG_SciInt32_AsIntArrayAndSize") {
SWIGINTERN int SWIGINTERN int
SWIG_AsCheck_Sequence_dec(int)(SciObject _obj) { SWIG_AsCheck_Sequence_dec(int)(SwigSciObject _obj) {
SciErr sciErr; SciErr sciErr;
int *piAddrVar; int *piAddrVar;
@ -36,7 +36,7 @@ SWIG_AsCheck_Sequence_dec(int)(SciObject _obj) {
fragment="SWIG_SciInt32_AsIntArrayAndSize") { fragment="SWIG_SciInt32_AsIntArrayAndSize") {
SWIGINTERN int SWIGINTERN int
SWIG_AsGet_Sequence_dec(int)(SciObject _obj, int **_pSequence) { SWIG_AsGet_Sequence_dec(int)(SwigSciObject _obj, int **_pSequence) {
int iMatrixRowCount; int iMatrixRowCount;
int iMatrixColCount; int iMatrixColCount;
return (SWIG_SciInt32_AsIntArrayAndSize(pvApiCtx, _obj, &iMatrixRowCount, &iMatrixColCount, _pSequence, SWIG_Scilab_GetFname())); return (SWIG_SciInt32_AsIntArrayAndSize(pvApiCtx, _obj, &iMatrixRowCount, &iMatrixColCount, _pSequence, SWIG_Scilab_GetFname()));
@ -47,7 +47,7 @@ SWIG_AsGet_Sequence_dec(int)(SciObject _obj, int **_pSequence) {
fragment="SWIG_SciInt32_AsIntArrayAndSize") { fragment="SWIG_SciInt32_AsIntArrayAndSize") {
SWIGINTERN int SWIGINTERN int
SWIG_AsSize_Sequence_dec(int)(SciObject _obj, int *_piSize) { SWIG_AsSize_Sequence_dec(int)(SwigSciObject _obj, int *_piSize) {
int *piMatrix; int *piMatrix;
int iMatrixRowCount; int iMatrixRowCount;
int iMatrixColCount; int iMatrixColCount;
@ -75,9 +75,9 @@ SWIG_FromCreate_Sequence_dec(int)(int _size, int **_sequence) {
%fragment(SWIG_FromSet_Sequence_frag(int), "header", %fragment(SWIG_FromSet_Sequence_frag(int), "header",
fragment="SWIG_SciInt32_FromIntArrayAndSize") { fragment="SWIG_SciInt32_FromIntArrayAndSize") {
SWIGINTERN SciObject SWIGINTERN SwigSciObject
SWIG_FromSet_Sequence_dec(int)(int _size, int *_sequence) { SWIG_FromSet_Sequence_dec(int)(int _size, int *_sequence) {
SciObject obj = SWIG_SciInt32_FromIntArrayAndSize(pvApiCtx, SWIG_Scilab_GetOutputPosition(), 1, _size, _sequence); SwigSciObject obj = SWIG_SciInt32_FromIntArrayAndSize(pvApiCtx, SWIG_Scilab_GetOutputPosition(), 1, _size, _sequence);
delete (int *)_sequence; delete (int *)_sequence;
return obj; return obj;
} }
@ -86,7 +86,7 @@ SWIG_FromSet_Sequence_dec(int)(int _size, int *_sequence) {
%fragment(SWIG_AsVal_SequenceItem_frag(int), "header") { %fragment(SWIG_AsVal_SequenceItem_frag(int), "header") {
SWIGINTERN int SWIGINTERN int
SWIG_AsVal_SequenceItem_dec(int)(SciObject _obj, int *_pSequence, int _iItemIndex, int *_pItemValue) { SWIG_AsVal_SequenceItem_dec(int)(SwigSciObject _obj, int *_pSequence, int _iItemIndex, int *_pItemValue) {
*_pItemValue = _pSequence[_iItemIndex]; *_pItemValue = _pSequence[_iItemIndex];
return SWIG_OK; return SWIG_OK;
} }

10
Lib/scilab/scisequencepointer.swg
View file

@ -10,7 +10,7 @@
fragment="SWIG_ScilabList") { fragment="SWIG_ScilabList") {
SWIGINTERN int SWIGINTERN int
SWIG_AsCheck_Sequence_dec(ptr)(SciObject _obj) { SWIG_AsCheck_Sequence_dec(ptr)(SwigSciObject _obj) {
return SWIG_CheckScilabList(_obj); return SWIG_CheckScilabList(_obj);
} }
} }
@ -19,7 +19,7 @@ SWIG_AsCheck_Sequence_dec(ptr)(SciObject _obj) {
fragment="SWIG_ScilabList") { fragment="SWIG_ScilabList") {
SWIGINTERN int SWIGINTERN int
SWIG_AsGet_Sequence_dec(ptr)(SciObject _obj, int **_piSequence) { SWIG_AsGet_Sequence_dec(ptr)(SwigSciObject _obj, int **_piSequence) {
return SWIG_GetScilabList(_obj, _piSequence); return SWIG_GetScilabList(_obj, _piSequence);
} }
} }
@ -28,7 +28,7 @@ SWIG_AsGet_Sequence_dec(ptr)(SciObject _obj, int **_piSequence) {
fragment="SWIG_ScilabList") { fragment="SWIG_ScilabList") {
SWIGINTERN int SWIGINTERN int
SWIG_AsSize_Sequence_dec(ptr)(SciObject _obj, int *_piSize) { SWIG_AsSize_Sequence_dec(ptr)(SwigSciObject _obj, int *_piSize) {
return SWIG_GetScilabListSize(_obj, _piSize); return SWIG_GetScilabListSize(_obj, _piSize);
} }
} }
@ -44,7 +44,7 @@ SWIG_FromCreate_Sequence_dec(ptr)(int _size, long long **_sequence) {
%fragment(SWIG_FromSet_Sequence_frag(ptr), "header") { %fragment(SWIG_FromSet_Sequence_frag(ptr), "header") {
SWIGINTERN SciObject SWIGINTERN SwigSciObject
SWIG_FromSet_Sequence_dec(ptr)(int _size, long long *_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, long long *_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, void **_pItemValue) SWIG_AsVal_SequenceItem_dec(ptr)(SwigSciObject _obj, int *_piSequence, int _itemIndex, void **_pItemValue)
{ {
SciErr sciErr; SciErr sciErr;
int *piItemAddr; int *piItemAddr;

12
Lib/scilab/scisequencestring.swg
View file

@ -10,7 +10,7 @@
fragment="SwigScilabStringToCharPtrArrayAndSize") { fragment="SwigScilabStringToCharPtrArrayAndSize") {
SWIGINTERN int SWIGINTERN int
SWIG_AsCheck_Sequence_dec(std::string)(SciObject _obj) { SWIG_AsCheck_Sequence_dec(std::string)(SwigSciObject _obj) {
SciErr sciErr; SciErr sciErr;
int *piAddrVar; int *piAddrVar;
@ -36,7 +36,7 @@ SWIG_AsCheck_Sequence_dec(std::string)(SciObject _obj) {
fragment="SwigScilabStringToCharPtrArrayAndSize") { fragment="SwigScilabStringToCharPtrArrayAndSize") {
SWIGINTERN int SWIGINTERN int
SWIG_AsGet_Sequence_dec(std::string)(SciObject _obj, char ***_pSequence) { SWIG_AsGet_Sequence_dec(std::string)(SwigSciObject _obj, char ***_pSequence) {
int iSize; int iSize;
return (SwigScilabStringToCharPtrArrayAndSize(pvApiCtx, _obj, _pSequence, &iSize, SWIG_Scilab_GetFname())); return (SwigScilabStringToCharPtrArrayAndSize(pvApiCtx, _obj, _pSequence, &iSize, SWIG_Scilab_GetFname()));
} }
@ -46,7 +46,7 @@ SWIG_AsGet_Sequence_dec(std::string)(SciObject _obj, char ***_pSequence) {
fragment="SwigScilabStringToCharPtrArrayAndSize") { fragment="SwigScilabStringToCharPtrArrayAndSize") {
SWIGINTERN int SWIGINTERN int
SWIG_AsSize_Sequence_dec(std::string)(SciObject _obj, int *_piSize) { SWIG_AsSize_Sequence_dec(std::string)(SwigSciObject _obj, int *_piSize) {
char **pstMatrix; char **pstMatrix;
if (SwigScilabStringToCharPtrArrayAndSize(pvApiCtx, _obj, &pstMatrix, _piSize, SWIG_Scilab_GetFname()) == SWIG_OK) { if (SwigScilabStringToCharPtrArrayAndSize(pvApiCtx, _obj, &pstMatrix, _piSize, SWIG_Scilab_GetFname()) == SWIG_OK) {
return SWIG_OK; return SWIG_OK;
@ -67,9 +67,9 @@ SWIG_FromCreate_Sequence_dec(std::string)(int _size, char ***_sequence) {
%fragment(SWIG_FromSet_Sequence_frag(std::string), "header", %fragment(SWIG_FromSet_Sequence_frag(std::string), "header",
fragment="SwigScilabStringFromCharPtrArray") { fragment="SwigScilabStringFromCharPtrArray") {
SWIGINTERN SciObject SWIGINTERN SwigSciObject
SWIG_FromSet_Sequence_dec(std::string)(int _size, char **_sequence) { SWIG_FromSet_Sequence_dec(std::string)(int _size, char **_sequence) {
SciObject obj = SwigScilabStringFromCharPtrArray(pvApiCtx, SWIG_Scilab_GetOutputPosition(), _sequence, _size); SwigSciObject obj = SwigScilabStringFromCharPtrArray(pvApiCtx, SWIG_Scilab_GetOutputPosition(), _sequence, _size);
delete (char **)_sequence; delete (char **)_sequence;
return obj; return obj;
} }
@ -78,7 +78,7 @@ SWIG_FromSet_Sequence_dec(std::string)(int _size, char **_sequence) {
%fragment(SWIG_AsVal_SequenceItem_frag(std::string), "header") { %fragment(SWIG_AsVal_SequenceItem_frag(std::string), "header") {
SWIGINTERN int SWIGINTERN int
SWIG_AsVal_SequenceItem_dec(std::string)(SciObject _obj, char **_pSequence, int _iItemIndex, std::string *_pItemValue) { SWIG_AsVal_SequenceItem_dec(std::string)(SwigSciObject _obj, char **_pSequence, int _iItemIndex, std::string *_pItemValue) {
*_pItemValue = std::string(_pSequence[_iItemIndex]); *_pItemValue = std::string(_pSequence[_iItemIndex]);
return SWIG_OK; return SWIG_OK;
} }

2
Lib/scilab/scishort.swg
View file

@ -4,7 +4,7 @@
*/ */
%fragment(SWIG_AsVal_frag(short), "header", fragment=SWIG_AsVal_frag(int)) { %fragment(SWIG_AsVal_frag(short), "header", fragment=SWIG_AsVal_frag(int)) {
SWIGINTERN int SWIGINTERN int
SWIG_AsVal_dec(short)(SciObject _iVar, short *_pshValue) { SWIG_AsVal_dec(short)(SwigSciObject _iVar, short *_pshValue) {
int iValue = 0.0; int iValue = 0.0;
if(SWIG_AsVal_dec(int)(_iVar, &iValue) != SWIG_OK) { if(SWIG_AsVal_dec(int)(_iVar, &iValue) != SWIG_OK) {
return SWIG_ERROR; return SWIG_ERROR;

42
Lib/scilab/scistdcommon.swg
View file

@ -3,44 +3,44 @@
namespace swig { namespace swig {
// Traits that provides the from method // Traits that provides the from method
template <class Type> struct traits_from_ptr { template <class Type> struct traits_from_ptr {
static SciObject from(Type *val, int owner = 0) { static SwigSciObject from(Type *val, int owner = 0) {
return 0; //SWIG_NewPointerObj(val, type_info<Type>(), owner); return 0; //SWIG_NewPointerObj(val, type_info<Type>(), owner);
} }
}; };
template <class Type> struct traits_from { template <class Type> struct traits_from {
static SciObject from(const Type& val) { static SwigSciObject from(const Type& val) {
return traits_from_ptr<Type>::from(new Type(val), 1); return traits_from_ptr<Type>::from(new Type(val), 1);
} }
}; };
template <class Type> struct traits_from<Type *> { template <class Type> struct traits_from<Type *> {
static SciObject from(Type* val) { static SwigSciObject from(Type* val) {
return traits_from_ptr<Type>::from(val, 0); return traits_from_ptr<Type>::from(val, 0);
} }
}; };
template <class Type> struct traits_from<const Type *> { template <class Type> struct traits_from<const Type *> {
static SciObject from(const Type* val) { static SwigSciObject from(const Type* val) {
return traits_from_ptr<Type>::from(const_cast<Type*>(val), 0); return traits_from_ptr<Type>::from(const_cast<Type*>(val), 0);
} }
}; };
template <class Type> template <class Type>
inline SciObject from(const Type& val) { inline SwigSciObject from(const Type& val) {
return traits_from<Type>::from(val); return traits_from<Type>::from(val);
} }
template <class Type> template <class Type>
inline SciObject from_ptr(Type* val, int owner) { inline SwigSciObject from_ptr(Type* val, int owner) {
return traits_from_ptr<Type>::from(val, owner); return traits_from_ptr<Type>::from(val, owner);
} }
// Traits that provides the asval/as/check method // Traits that provides the asval/as/check method
template <class Type> template <class Type>
struct traits_asptr { struct traits_asptr {
static int asptr(const SciObject& obj, Type **val) { static int asptr(const SwigSciObject& obj, Type **val) {
Type *p; Type *p;
int res = SWIG_ConvertPtr(obj, (void**)&p, type_info<Type>(), 0); int res = SWIG_ConvertPtr(obj, (void**)&p, type_info<Type>(), 0);
if (SWIG_IsOK(res)) { if (SWIG_IsOK(res)) {
@ -51,13 +51,13 @@ namespace swig {
}; };
template <class Type> template <class Type>
inline int asptr(const SciObject& obj, Type **vptr) { inline int asptr(const SwigSciObject& obj, Type **vptr) {
return traits_asptr<Type>::asptr(obj, vptr); return traits_asptr<Type>::asptr(obj, vptr);
} }
template <class Type> template <class Type>
struct traits_asval { struct traits_asval {
static int asval(const SciObject& obj, Type *val) { static int asval(const SwigSciObject& obj, Type *val) {
if (val) { if (val) {
Type *p = 0; Type *p = 0;
int res = traits_asptr<Type>::asptr(obj, &p); int res = traits_asptr<Type>::asptr(obj, &p);
@ -80,7 +80,7 @@ namespace swig {
}; };
template <class Type> struct traits_asval<Type*> { template <class Type> struct traits_asval<Type*> {
static int asval(const SciObject& obj, Type **val) { static int asval(const SwigSciObject& obj, Type **val) {
if (val) { if (val) {
typedef typename noconst_traits<Type>::noconst_type noconst_type; typedef typename noconst_traits<Type>::noconst_type noconst_type;
noconst_type *p = 0; noconst_type *p = 0;
@ -96,13 +96,13 @@ namespace swig {
}; };
template <class Type> template <class Type>
inline int asval(const SciObject& obj, Type *val) { inline int asval(const SwigSciObject& obj, Type *val) {
return traits_asval<Type>::asval(obj, val); return traits_asval<Type>::asval(obj, val);
} }
template <class Type> template <class Type>
struct traits_as<Type, value_category> { struct traits_as<Type, value_category> {
static Type as(const SciObject& obj, bool throw_error) { static Type as(const SwigSciObject& obj, bool throw_error) {
Type v; Type v;
int res = asval(obj, &v); int res = asval(obj, &v);
//if (!obj.is_defined() || !SWIG_IsOK(res)) { //if (!obj.is_defined() || !SWIG_IsOK(res)) {
@ -117,7 +117,7 @@ namespace swig {
template <class Type> template <class Type>
struct traits_as<Type, pointer_category> { struct traits_as<Type, pointer_category> {
static Type as(const SciObject& obj, bool throw_error) { static Type as(const SwigSciObject& obj, bool throw_error) {
Type *v = 0; Type *v = 0;
int res = traits_asptr<Type>::asptr(obj, &v); int res = traits_asptr<Type>::asptr(obj, &v);
if (SWIG_IsOK(res) && v) { if (SWIG_IsOK(res) && v) {
@ -143,7 +143,7 @@ namespace swig {
template <class Type> template <class Type>
struct traits_as<Type*, pointer_category> { struct traits_as<Type*, pointer_category> {
static Type* as(const SciObject& obj, bool throw_error) { static Type* as(const SwigSciObject& obj, bool throw_error) {
Type *v = 0; Type *v = 0;
int res = traits_asptr<Type>::asptr(obj, &v); int res = traits_asptr<Type>::asptr(obj, &v);
if (SWIG_IsOK(res)) { if (SWIG_IsOK(res)) {
@ -159,13 +159,13 @@ namespace swig {
}; };
template <class Type> template <class Type>
inline Type as(const SciObject& obj, bool te = false) { inline Type as(const SwigSciObject& obj, bool te = false) {
return traits_as<Type, typename traits<Type>::category>::as(obj, te); return traits_as<Type, typename traits<Type>::category>::as(obj, te);
} }
template <class Type> template <class Type>
struct traits_check<Type, value_category> { struct traits_check<Type, value_category> {
static bool check(const SciObject& obj) { static bool check(const SwigSciObject& obj) {
int res = asval(obj, (Type *)(0)); int res = asval(obj, (Type *)(0));
return SWIG_IsOK(res) ? true : false; return SWIG_IsOK(res) ? true : false;
} }
@ -173,14 +173,14 @@ namespace swig {
template <class Type> template <class Type>
struct traits_check<Type, pointer_category> { struct traits_check<Type, pointer_category> {
static bool check(const SciObject& obj) { static bool check(const SwigSciObject& obj) {
int res = asptr(obj, (Type **)(0)); int res = asptr(obj, (Type **)(0));
return SWIG_IsOK(res) ? true : false; return SWIG_IsOK(res) ? true : false;
} }
}; };
template <class Type> template <class Type>
inline bool check(const SciObject& obj) { inline bool check(const SwigSciObject& obj) {
return traits_check<Type, typename traits<Type>::category>::check(obj); return traits_check<Type, typename traits<Type>::category>::check(obj);
} }
} }
@ -191,7 +191,7 @@ namespace swig {
namespace swig { namespace swig {
template <> struct traits_asval<Type > { template <> struct traits_asval<Type > {
typedef Type value_type; typedef Type value_type;
static int asval(const SciObject& obj, value_type *val) { static int asval(const SwigSciObject& obj, value_type *val) {
if (Check(obj)) { if (Check(obj)) {
if (val) *val = As(obj); if (val) *val = As(obj);
return SWIG_OK; return SWIG_OK;
@ -201,14 +201,14 @@ namespace swig {
}; };
template <> struct traits_from<Type > { template <> struct traits_from<Type > {
typedef Type value_type; typedef Type value_type;
static SciObject from(const value_type& val) { static SwigSciObject from(const value_type& val) {
return From(val); return From(val);
} }
}; };
template <> template <>
struct traits_check<Type, value_category> { struct traits_check<Type, value_category> {
static int check(const SciObject& obj) { static int check(const SwigSciObject& obj) {
int res = Check(obj); int res = Check(obj);
return obj && res ? res : 0; return obj && res ? res : 0;
} }

8
Lib/scilab/std_common.i
View file

@ -17,13 +17,13 @@ namespace swig {
}; };
template <> struct traits_asval<Type > { template <> struct traits_asval<Type > {
typedef Type value_type; typedef Type value_type;
static int asval(SciObject obj, value_type *val) { static int asval(SwigSciObject obj, value_type *val) {
return SWIG_AsVal(Type)(obj, val); return SWIG_AsVal(Type)(obj, val);
} }
}; };
template <> struct traits_from<Type > { template <> struct traits_from<Type > {
typedef Type value_type; typedef Type value_type;
static SciObject from(const value_type& val) { static SwigSciObject from(const value_type& val) {
return SWIG_From(Type)(val); return SWIG_From(Type)(val);
} }
}; };
@ -46,13 +46,13 @@ namespace swig {
namespace swig { namespace swig {
template <> struct traits_asval<Type > { template <> struct traits_asval<Type > {
typedef Type value_type; typedef Type value_type;
static int asval(SciObject obj, value_type *val) { static int asval(SwigSciObject obj, value_type *val) {
return SWIG_AsVal(int)(obj, (int *)val); return SWIG_AsVal(int)(obj, (int *)val);
} }
}; };
template <> struct traits_from<Type > { template <> struct traits_from<Type > {
typedef Type value_type; typedef Type value_type;
static SciObject from(const value_type& val) { static SwigSciObject from(const value_type& val) {
return SWIG_From(int)((int)val); return SWIG_From(int)((int)val);
} }
}; };

4
Lib/scilab/std_list.i
View file

@ -7,14 +7,14 @@
namespace swig { namespace swig {
template <class T > template <class T >
struct traits_asptr<std::list<T> > { struct traits_asptr<std::list<T> > {
static int asptr(SciObject obj, std::list<T> **lis) { static int asptr(SwigSciObject obj, std::list<T> **lis) {
return traits_asptr_stdseq<std::list<T> >::asptr(obj, lis); return traits_asptr_stdseq<std::list<T> >::asptr(obj, lis);
} }
}; };
template <class T> template <class T>
struct traits_from<std::list<T> > { struct traits_from<std::list<T> > {
static SciObject from(const std::list<T> &lis) { static SwigSciObject from(const std::list<T> &lis) {
return traits_from_stdseq<std::list<T> >::from(lis); return traits_from_stdseq<std::list<T> >::from(lis);
} }
}; };

4
Lib/scilab/std_set.i
View file

@ -10,14 +10,14 @@
namespace swig { namespace swig {
template <class T> template <class T>
struct traits_asptr<std::set<T> > { struct traits_asptr<std::set<T> > {
static int asptr(const SciObject &obj, std::set<T> **set) { static int asptr(const SwigSciObject &obj, std::set<T> **set) {
return traits_asptr_stdseq<std::set<T> >::asptr(obj, set); return traits_asptr_stdseq<std::set<T> >::asptr(obj, set);
} }
}; };
template <class T> template <class T>
struct traits_from<std::set<T> > { struct traits_from<std::set<T> > {
static SciObject from(const std::set<T>& set) { static SwigSciObject from(const std::set<T>& set) {
return traits_from_stdseq<std::set<T> >::from(set); return traits_from_stdseq<std::set<T> >::from(set);
} }
}; };

4
Lib/scilab/std_vector.i
View file

@ -10,14 +10,14 @@
namespace swig { namespace swig {
template <class T> template <class T>
struct traits_asptr<std::vector<T> > { struct traits_asptr<std::vector<T> > {
static int asptr(const SciObject &obj, std::vector<T> **vec) { static int asptr(const SwigSciObject &obj, std::vector<T> **vec) {
return traits_asptr_stdseq<std::vector<T> >::asptr(obj, vec); return traits_asptr_stdseq<std::vector<T> >::asptr(obj, vec);
} }
}; };
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 SwigSciObject from(const std::vector<T>& vec) {
return traits_from_stdseq<std::vector<T> >::from(vec); return traits_from_stdseq<std::vector<T> >::from(vec);
} }
}; };