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

Revert "Octave: cleanup/restructure library files"

Browse source 
This reverts commit bf12d76d03.

Reverting a series of Octave commits for re-applying again without
incorrect whitespace changes.
This commit is contained in:
William S Fulton 2014-10-09 19:34:02 +01:00
commit 23373e9ffd
42 changed files with 3698 additions and 4284 deletions
Download patch file Download diff file Expand all files Collapse all files

210
Lib/octave/std_pair.i
View file

@ -1,145 +1,129 @@
//
// std_pair.i - STL pair support
//
// Pairs
%include <octstdcommon.swg>
//#define SWIG_STD_PAIR_ASVAL
%fragment("StdPairTraits", "header", fragment = "StdTraits")
{
namespace swig
{
%fragment("StdPairTraits","header",fragment="StdTraits") {
namespace swig {
#ifdef SWIG_STD_PAIR_ASVAL
template <class T, class U >
struct traits_asval<std::pair<T, U> > {
struct traits_asval<std::pair<T,U> > {
typedef std::pair<T,U> value_type;
typedef std::pair<T, U> value_type;
static int get_pair(const octave_value& first, octave_value second, std::pair<T, U> *val) {
if (val) {
T* pfirst = & (val->first);
int res1 = swig::asval(first, pfirst);
if (!SWIG_IsOK(res1)) {
return res1;
}
U* psecond = & (val->second);
int res2 = swig::asval(second, psecond);
if (!SWIG_IsOK(res2)) {
return res2;
}
return res1 > res2 ? res1 : res2;
} else {
T* pfirst = 0;
int res1 = swig::asval(first, pfirst);
if (!SWIG_IsOK(res1)) {
return res1;
}
U* psecond = 0;
int res2 = swig::asval((PyObject*) second, psecond);
if (!SWIG_IsOK(res2)) {
return res2;
}
return res1 > res2 ? res1 : res2;
}
static int get_pair(const octave_value& first, octave_value second,
std::pair<T,U> *val)
{
if (val) {
T *pfirst = &(val->first);
int res1 = swig::asval(first, pfirst);
if (!SWIG_IsOK(res1))
return res1;
U *psecond = &(val->second);
int res2 = swig::asval(second, psecond);
if (!SWIG_IsOK(res2))
return res2;
return res1 > res2 ? res1 : res2;
} else {
T *pfirst = 0;
int res1 = swig::asval(first, pfirst);
if (!SWIG_IsOK(res1))
return res1;
U *psecond = 0;
int res2 = swig::asval((PyObject*)second, psecond);
if (!SWIG_IsOK(res2))
return res2;
return res1 > res2 ? res1 : res2;
}
}
static int asval(const octave_value& obj, std::pair<T, U> *val) {
if (obj.is_cell()) {
Cell c = obj.cell_value();
if (c.numel() < 2) {
error("pair from Cell array requires at least two elements");
return SWIG_ERROR;
}
return get_pair(c(0), c(1), val);
} else {
value_type* p;
int res = SWIG_ConvertPtr(obj, (void**) &p, swig::type_info<value_type>(), 0);
if (SWIG_IsOK(res) && val) {
*val = *p;
}
return res;
}
return SWIG_ERROR;
static int asval(const octave_value& obj, std::pair<T,U> *val) {
if (obj.is_cell()) {
Cell c=obj.cell_value();
if (c.numel()<2) {
error("pair from Cell array requires at least two elements");
return SWIG_ERROR;
}
return get_pair(c(0),c(1),val);
} else {
value_type *p;
int res = SWIG_ConvertPtr(obj,(void**)&p,swig::type_info<value_type>(),0);
if (SWIG_IsOK(res) && val)
*val = *p;
return res;
}
return SWIG_ERROR;
}
};
#else
template <class T, class U >
struct traits_asptr<std::pair<T, U> > {
typedef std::pair<T, U> value_type;
struct traits_asptr<std::pair<T,U> > {
typedef std::pair<T,U> value_type;
static int get_pair(const octave_value& first, octave_value second, std::pair<T, U> **val) {
if (val) {
value_type* vp = %new_instance(std::pair<T, U>);
T* pfirst = & (vp->first);
int res1 = swig::asval(first, pfirst);
if (!SWIG_IsOK(res1)) {
return res1;
}
U* psecond = & (vp->second);
int res2 = swig::asval(second, psecond);
if (!SWIG_IsOK(res2)) {
return res2;
}
*val = vp;
return SWIG_AddNewMask(res1 > res2 ? res1 : res2);
} else {
T* pfirst = 0;
int res1 = swig::asval(first, pfirst);
if (!SWIG_IsOK(res1)) {
return res1;
}
U* psecond = 0;
int res2 = swig::asval(second, psecond);
if (!SWIG_IsOK(res2)) {
return res2;
}
return res1 > res2 ? res1 : res2;
}
return SWIG_ERROR;
static int get_pair(const octave_value& first, octave_value second,
std::pair<T,U> **val)
{
if (val) {
value_type *vp = %new_instance(std::pair<T,U>);
T *pfirst = &(vp->first);
int res1 = swig::asval(first, pfirst);
if (!SWIG_IsOK(res1))
return res1;
U *psecond = &(vp->second);
int res2 = swig::asval(second, psecond);
if (!SWIG_IsOK(res2))
return res2;
*val = vp;
return SWIG_AddNewMask(res1 > res2 ? res1 : res2);
} else {
T *pfirst = 0;
int res1 = swig::asval(first, pfirst);
if (!SWIG_IsOK(res1))
return res1;
U *psecond = 0;
int res2 = swig::asval(second, psecond);
if (!SWIG_IsOK(res2))
return res2;
return res1 > res2 ? res1 : res2;
}
return SWIG_ERROR;
}
static int asptr(const octave_value& obj, std::pair<T, U> **val) {
if (obj.is_cell()) {
Cell c = obj.cell_value();
if (c.numel() < 2) {
error("pair from Cell array requires at least two elements");
return SWIG_ERROR;
}
return get_pair(c(0), c(1), val);
} else {
value_type* p;
int res = SWIG_ConvertPtr(obj, (void**) &p, swig::type_info<value_type>(), 0);
if (SWIG_IsOK(res) && val) {
*val = p;
}
return res;
}
return SWIG_ERROR;
static int asptr(const octave_value& obj, std::pair<T,U> **val) {
if (obj.is_cell()) {
Cell c=obj.cell_value();
if (c.numel()<2) {
error("pair from Cell array requires at least two elements");
return SWIG_ERROR;
}
return get_pair(c(0),c(1),val);
} else {
value_type *p;
int res = SWIG_ConvertPtr(obj,(void**)&p,swig::type_info<value_type>(),0);
if (SWIG_IsOK(res) && val)
*val = p;
return res;
}
return SWIG_ERROR;
}
};
#endif
template <class T, class U >
struct traits_from<std::pair<T, U> > {
static octave_value from(const std::pair<T, U>& val) {
Cell c(1, 2);
c(0) = swig::from(val.first);
c(1) = swig::from(val.second);
return c;
struct traits_from<std::pair<T,U> > {
static octave_value from(const std::pair<T,U>& val) {
Cell c(1,2);
c(0)=swig::from(val.first);
c(1)=swig::from(val.second);
return c;
}
};
}
}
%define %swig_pair_methods(pair...)
%enddef
%include <std/std_pair.i>