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

Don't use long long if it isn't available

Browse source 
Adds preprocessor checks to avoid defining functions that use long long if it isn't available
Effects the following languages: javascript, octave, perl, python, r, ruby, tcl
This commit is contained in:
Alec Cooper 2016-01-01 15:32:53 -05:00
commit 4e2fc7d115
8 changed files with 108 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Lib/javascript/jsc/javascriptprimtypes.swg
View file

@ -98,18 +98,21 @@ SWIG_AsVal_dec(unsigned long)(JSValueRef obj, unsigned long *val)
%fragment(SWIG_From_frag(long long),"header",
fragment=SWIG_From_frag(long),
fragment="<limits.h>") {
fragment="SWIG_LongLongAvailable") {
%#ifdef SWIG_LONG_LONG_AVAILABLE
SWIGINTERNINLINE JSValueRef
SWIG_From_dec(long long)(long long value)
{
return JSValueMakeNumber(context, value);
}
%#endif
}
%fragment(SWIG_AsVal_frag(long long),"header",
fragment=SWIG_AsVal_frag(long),
fragment="SWIG_CanCastAsInteger",
fragment="<limits.h>") {
fragment="SWIG_LongLongAvailable") {
%#ifdef SWIG_LONG_LONG_AVAILABLE
SWIGINTERN int
SWIG_AsVal_dec(long long)(JSValueRef obj, long long* val)
{
@ -120,6 +123,7 @@ SWIG_AsVal_dec(long long)(JSValueRef obj, long long* val)
return SWIG_OK;
}
%#endif
}
/* unsigned long long */
@ -127,19 +131,22 @@ SWIG_AsVal_dec(long long)(JSValueRef obj, long long* val)
%fragment(SWIG_From_frag(unsigned long long),"header",
fragment=SWIG_From_frag(long long),
fragment="<limits.h>") {
fragment="SWIG_LongLongAvailable") {
%#ifdef SWIG_LONG_LONG_AVAILABLE
SWIGINTERN JSValueRef
SWIG_From_dec(unsigned long long)(unsigned long long value)
{
return (value > LONG_MAX) ?
JSValueMakeNumber(context, value) : JSValueMakeNumber(context, %numeric_cast(value,long));
}
%#endif
}
%fragment(SWIG_AsVal_frag(unsigned long long),"header",
fragment=SWIG_AsVal_frag(unsigned long),
fragment="SWIG_CanCastAsInteger",
fragment="<limits.h>") {
fragment="SWIG_LongLongAvailable") {
%#ifdef SWIG_LONG_LONG_AVAILABLE
SWIGINTERN int
SWIG_AsVal_dec(unsigned long long)(JSValueRef obj, unsigned long long *val)
{
@ -158,6 +165,7 @@ SWIG_AsVal_dec(unsigned long long)(JSValueRef obj, unsigned long long *val)
return SWIG_OK;
}
%#endif
}
/* double */

16
Lib/javascript/v8/javascriptprimtypes.swg
View file

@ -112,18 +112,21 @@ int SWIG_AsVal_dec(unsigned long)(v8::Handle<v8::Value> obj, unsigned long *val)
%fragment(SWIG_From_frag(long long),"header",
fragment=SWIG_From_frag(long),
fragment="<limits.h>") {
fragment="SWIG_LongLongAvailable") {
%#ifdef SWIG_LONG_LONG_AVAILABLE
SWIGINTERNINLINE
v8::Handle<v8::Value> SWIG_From_dec(long long)(long long value)
{
return SWIGV8_NUMBER_NEW(value);
}
%#endif
}
%fragment(SWIG_AsVal_frag(long long),"header",
fragment=SWIG_AsVal_frag(long),
fragment="SWIG_CanCastAsInteger",
fragment="<limits.h>") {
fragment="SWIG_LongLongAvailable") {
%#ifdef SWIG_LONG_LONG_AVAILABLE
SWIGINTERN
int SWIG_AsVal_dec(long long)(v8::Handle<v8::Value> obj, long long* val)
{
@ -134,6 +137,7 @@ int SWIG_AsVal_dec(long long)(v8::Handle<v8::Value> obj, long long* val)
return SWIG_OK;
}
%#endif
}
/* unsigned long long */
@ -141,19 +145,22 @@ int SWIG_AsVal_dec(long long)(v8::Handle<v8::Value> obj, long long* val)
%fragment(SWIG_From_frag(unsigned long long),"header",
fragment=SWIG_From_frag(long long),
fragment="<limits.h>") {
fragment="SWIG_LongLongAvailable") {
%#ifdef SWIG_LONG_LONG_AVAILABLE
SWIGINTERNINLINE
v8::Handle<v8::Value> SWIG_From_dec(unsigned long long)(unsigned long long value)
{
return (value > LONG_MAX) ?
SWIGV8_INTEGER_NEW_UNS(value) : SWIGV8_INTEGER_NEW(%numeric_cast(value,long));
}
%#endif
}
%fragment(SWIG_AsVal_frag(unsigned long long),"header",
fragment=SWIG_AsVal_frag(unsigned long),
fragment="SWIG_CanCastAsInteger",
fragment="<limits.h>") {
fragment="SWIG_LongLongAvailable") {
%#ifdef SWIG_LONG_LONG_AVAILABLE
SWIGINTERN
int SWIG_AsVal_dec(unsigned long long)(v8::Handle<v8::Value> obj, unsigned long long *val)
{
@ -171,6 +178,7 @@ int SWIG_AsVal_dec(unsigned long long)(v8::Handle<v8::Value> obj, unsigned long
return SWIG_OK;
}
%#endif
}
/* double */

20
Lib/octave/octprimtypes.swg
View file

@ -97,15 +97,20 @@ SWIG_AsVal_dec(bool)(const octave_value& ov, bool *val)
// long long
%fragment(SWIG_From_frag(long long),"header") {
%fragment(SWIG_From_frag(long long),"header",
fragment="SWIG_LongLongAvailable") {
%#ifdef SWIG_LONG_LONG_AVAILABLE
SWIGINTERNINLINE octave_value SWIG_From_dec(long long) (long long value)
{
return octave_int64(value);
}
%#endif
}
%fragment(SWIG_AsVal_frag(long long),"header") {
%fragment(SWIG_AsVal_frag(long long),"header",
fragment="SWIG_LongLongAvailable") {
%#ifdef SWIG_LONG_LONG_AVAILABLE
SWIGINTERN int SWIG_AsVal_dec(long long)(const octave_value& ov, long long* val)
{
if (!ov.is_scalar_type())
@ -127,16 +132,22 @@ SWIG_AsVal_dec(bool)(const octave_value& ov, bool *val)
}
return SWIG_OK;
}
%#endif
}
%fragment(SWIG_From_frag(unsigned long long),"header") {
%fragment(SWIG_From_frag(unsigned long long),"header",
fragment="SWIG_LongLongAvailable") {
%#ifdef SWIG_LONG_LONG_AVAILABLE
SWIGINTERNINLINE octave_value SWIG_From_dec(unsigned long long) (unsigned long long value)
{
return octave_uint64(value);
}
%#endif
}
%fragment(SWIG_AsVal_frag(unsigned long long),"header") {
%fragment(SWIG_AsVal_frag(unsigned long long),"header",
fragment="SWIG_LongLongAvailable") {
%#ifdef SWIG_LONG_LONG_AVAILABLE
SWIGINTERN int SWIG_AsVal_dec(unsigned long long)(const octave_value& ov, unsigned long long* val)
{
if (!ov.is_scalar_type())
@ -171,6 +182,7 @@ SWIG_AsVal_dec(bool)(const octave_value& ov, bool *val)
}
return SWIG_OK;
}
%#endif
}
// double

17
Lib/perl5/perlprimtypes.swg
View file

@ -167,8 +167,9 @@ SWIG_AsVal_dec(unsigned long)(SV *obj, unsigned long *val)
/* long long */
%fragment(SWIG_From_frag(long long),"header",
fragment=SWIG_From_frag(long),
fragment="SWIG_LongLongAvailable",
fragment="<stdio.h>") {
%#ifdef SWIG_LONG_LONG_AVAILABLE
SWIGINTERNINLINE SV *
SWIG_From_dec(long long)(long long value)
{
@ -183,13 +184,14 @@ SWIG_From_dec(long long)(long long value)
}
return sv_2mortal(sv);
}
%#endif
}
%fragment(SWIG_AsVal_frag(long long),"header",
fragment="<limits.h>",
fragment="SWIG_LongLongAvailable",
fragment="<stdlib.h>",
fragment="SWIG_CanCastAsInteger") {
%#ifdef SWIG_LONG_LONG_AVAILABLE
SWIGINTERN int
SWIG_AsVal_dec(long long)(SV *obj, long long *val)
{
@ -239,13 +241,15 @@ SWIG_AsVal_dec(long long)(SV *obj, long long *val)
}
return SWIG_TypeError;
}
%#endif
}
/* unsigned long long */
%fragment(SWIG_From_frag(unsigned long long),"header",
fragment=SWIG_From_frag(long long),
fragment="SWIG_LongLongAvailable",
fragment="<stdio.h>") {
%#ifdef SWIG_LONG_LONG_AVAILABLE
SWIGINTERNINLINE SV *
SWIG_From_dec(unsigned long long)(unsigned long long value)
{
@ -260,12 +264,14 @@ SWIG_From_dec(unsigned long long)(unsigned long long value)
}
return sv_2mortal(sv);
}
%#endif
}
%fragment(SWIG_AsVal_frag(unsigned long long),"header",
fragment="<limits.h>",
fragment="SWIG_LongLongAvailable",
fragment="<stdlib.h>",
fragment="SWIG_CanCastAsInteger") {
%#ifdef SWIG_LONG_LONG_AVAILABLE
SWIGINTERN int
SWIG_AsVal_dec(unsigned long long)(SV *obj, unsigned long long *val)
{
@ -312,6 +318,7 @@ SWIG_AsVal_dec(unsigned long long)(SV *obj, unsigned long long *val)
}
return SWIG_TypeError;
}
%#endif
}
/* double */

18
Lib/python/pyprimtypes.swg
View file

@ -180,20 +180,22 @@ SWIG_AsVal_dec(unsigned long)(PyObject *obj, unsigned long *val)
/* long long */
%fragment(SWIG_From_frag(long long),"header",
fragment=SWIG_From_frag(long),
fragment="<limits.h>") {
fragment="SWIG_LongLongAvailable") {
%#ifdef SWIG_LONG_LONG_AVAILABLE
SWIGINTERNINLINE PyObject*
SWIG_From_dec(long long)(long long value)
{
return ((value < LONG_MIN) || (value > LONG_MAX)) ?
PyLong_FromLongLong(value) : PyLong_FromLong(%numeric_cast(value,long));
}
%#endif
}
%fragment(SWIG_AsVal_frag(long long),"header",
fragment=SWIG_AsVal_frag(long),
fragment="SWIG_CanCastAsInteger",
fragment="<limits.h>") {
fragment="SWIG_LongLongAvailable") {
%#ifdef SWIG_LONG_LONG_AVAILABLE
SWIGINTERN int
SWIG_AsVal_dec(long long)(PyObject *obj, long long *val)
{
@ -230,25 +232,28 @@ SWIG_AsVal_dec(long long)(PyObject *obj, long long *val)
%#endif
return res;
}
%#endif
}
/* unsigned long long */
%fragment(SWIG_From_frag(unsigned long long),"header",
fragment=SWIG_From_frag(long long),
fragment="<limits.h>") {
fragment="SWIG_LongLongAvailable") {
%#ifdef SWIG_LONG_LONG_AVAILABLE
SWIGINTERNINLINE PyObject*
SWIG_From_dec(unsigned long long)(unsigned long long value)
{
return (value > LONG_MAX) ?
PyLong_FromUnsignedLongLong(value) : PyLong_FromLong(%numeric_cast(value,long));
}
%#endif
}
%fragment(SWIG_AsVal_frag(unsigned long long),"header",
fragment=SWIG_AsVal_frag(unsigned long),
fragment="SWIG_CanCastAsInteger",
fragment="<limits.h>") {
fragment="SWIG_LongLongAvailable") {
%#ifdef SWIG_LONG_LONG_AVAILABLE
SWIGINTERN int
SWIG_AsVal_dec(unsigned long long)(PyObject *obj, unsigned long long *val)
{
@ -284,6 +289,7 @@ SWIG_AsVal_dec(unsigned long long)(PyObject *obj, unsigned long long *val)
%#endif
return res;
}
%#endif
}
/* double */

20
Lib/r/rfragments.swg
View file

@ -44,21 +44,27 @@ SWIG_AsVal_dec(long)(SEXP obj, long *val)
}
%fragment(SWIG_From_frag(long long),"header") {
%fragment(SWIG_From_frag(long long),"header",
fragment="SWIG_LongLongAvailable") {
%#ifdef SWIG_LONG_LONG_AVAILABLE
SWIGINTERNINLINE SEXP
SWIG_From_dec(long long)(long long value)
{
return Rf_ScalarInteger((int)value);
}
%#endif
}
%fragment(SWIG_AsVal_frag(long long),"header") {
%fragment(SWIG_AsVal_frag(long long),"header",
fragment="SWIG_LongLongAvailable") {
%#ifdef SWIG_LONG_LONG_AVAILABLE
SWIGINTERNINLINE int
SWIG_AsVal_dec(long long)(SEXP obj, long long *val)
{
if (val) *val = Rf_asInteger(obj);
return SWIG_OK;
}
%#endif
}
%fragment(SWIG_From_frag(unsigned long),"header") {
@ -80,22 +86,28 @@ SWIG_AsVal_dec(unsigned long)(SEXP obj, unsigned long *val)
}
%fragment(SWIG_From_frag(unsigned long long),"header") {
%fragment(SWIG_From_frag(unsigned long long),"header",
fragment="SWIG_LongLongAvailable") {
%#ifdef SWIG_LONG_LONG_AVAILABLE
SWIGINTERNINLINE SEXP
SWIG_From_dec(unsigned long long)(unsigned long long value)
{
return Rf_ScalarInteger((int)value);
}
%#endif
}
%fragment(SWIG_AsVal_frag(unsigned long long),"header") {
%fragment(SWIG_AsVal_frag(unsigned long long),"header",
fragment="SWIG_LongLongAvailable") {
%#ifdef SWIG_LONG_LONG_AVAILABLE
SWIGINTERNINLINE int
SWIG_AsVal_dec(unsigned long long)(SEXP obj, unsigned long long *val)
{
if (val) *val = Rf_asInteger(obj);
return SWIG_OK;
}
%#endif
}
%fragment(SWIG_From_frag(double),"header") {

21
Lib/ruby/rubyprimtypes.swg
View file

@ -124,15 +124,20 @@ SWIG_AsVal_dec(unsigned long)(VALUE obj, unsigned long *val)
%fragment(SWIG_From_frag(long long),"header",
fragment=SWIG_From_frag(long),
fragment="<limits.h>") {
fragment="SWIG_LongLongAvailable") {
%#ifdef SWIG_LONG_LONG_AVAILABLE
SWIGINTERNINLINE VALUE
SWIG_From_dec(long long)(long long value)
{
return LL2NUM(value);
}
%#endif
}
%fragment(SWIG_AsVal_frag(long long),"header",fragment="SWIG_ruby_failed") {
%fragment(SWIG_AsVal_frag(long long),"header",
fragment="SWIG_ruby_failed",
fragment="SWIG_LongLongAvailable") {
%#ifdef SWIG_LONG_LONG_AVAILABLE
%ruby_aux_method(long long, NUM2LL, type == T_FIXNUM ? NUM2LL(obj) : rb_big2ll(obj))
SWIGINTERN int
@ -151,21 +156,26 @@ SWIG_AsVal_dec(long long)(VALUE obj, long long *val)
}
return SWIG_TypeError;
}
%#endif
}
/* unsigned long long */
%fragment(SWIG_From_frag(unsigned long long),"header",
fragment=SWIG_From_frag(long long),
fragment="<limits.h>") {
fragment="SWIG_LongLongAvailable") {
%#ifdef SWIG_LONG_LONG_AVAILABLE
SWIGINTERNINLINE VALUE
SWIG_From_dec(unsigned long long)(unsigned long long value)
{
return ULL2NUM(value);
}
%#endif
}
%fragment(SWIG_AsVal_frag(unsigned long long),"header",fragment="SWIG_ruby_failed") {
%fragment(SWIG_AsVal_frag(unsigned long long),"header",
fragment="SWIG_ruby_failed",
fragment="SWIG_LongLongAvailable") {
%#ifdef SWIG_LONG_LONG_AVAILABLE
%ruby_aux_method(long long, NUM2ULL, type == T_FIXNUM ? NUM2ULL(obj) : rb_big2ull(obj))
SWIGINTERN int
@ -184,6 +194,7 @@ SWIG_AsVal_dec(unsigned long long)(VALUE obj, unsigned long long *val)
}
return SWIG_TypeError;
}
%#endif
}
/* double */

16
Lib/tcl/tclprimtypes.swg
View file

@ -112,8 +112,9 @@ SWIG_AsVal_dec(unsigned long)(Tcl_Obj *obj, unsigned long *val) {
%fragment(SWIG_From_frag(long long),"header",
fragment=SWIG_From_frag(long),
fragment="<limits.h>",
fragment="SWIG_LongLongAvailable",
fragment="<stdio.h>") {
%#ifdef SWIG_LONG_LONG_AVAILABLE
SWIGINTERNINLINE Tcl_Obj*
SWIG_From_dec(long long)(long long value)
{
@ -125,11 +126,13 @@ SWIG_From_dec(long long)(long long value)
return Tcl_NewStringObj(temp,-1);
}
}
%#endif
}
%fragment(SWIG_AsVal_frag(long long),"header",
fragment="<limits.h>",
fragment="SWIG_LongLongAvailable",
fragment="<stdlib.h>") {
%#ifdef SWIG_LONG_LONG_AVAILABLE
SWIGINTERN int
SWIG_AsVal_dec(long long)(Tcl_Obj *obj, long long *val)
{
@ -160,14 +163,16 @@ SWIG_AsVal_dec(long long)(Tcl_Obj *obj, long long *val)
}
return SWIG_TypeError;
}
%#endif
}
/* unsigned long long */
%fragment(SWIG_From_frag(unsigned long long),"header",
fragment=SWIG_From_frag(long long),
fragment="<limits.h>",
fragment="SWIG_LongLongAvailable",
fragment="<stdio.h>") {
%#ifdef SWIG_LONG_LONG_AVAILABLE
SWIGINTERNINLINE Tcl_Obj*
SWIG_From_dec(unsigned long long)(unsigned long long value)
{
@ -179,12 +184,14 @@ SWIG_From_dec(unsigned long long)(unsigned long long value)
return Tcl_NewStringObj(temp,-1);
}
}
%#endif
}
%fragment(SWIG_AsVal_frag(unsigned long long),"header",
fragment=SWIG_AsVal_frag(unsigned long),
fragment="<limits.h>",
fragment="SWIG_LongLongAvailable",
fragment="<stdlib.h>") {
%#ifdef SWIG_LONG_LONG_AVAILABLE
SWIGINTERN int
SWIG_AsVal_dec(unsigned long long)(Tcl_Obj *obj, unsigned long long *val)
{
@ -216,6 +223,7 @@ SWIG_AsVal_dec(unsigned long long)(Tcl_Obj *obj, unsigned long long *val)
}
return SWIG_TypeError;
}
%#endif
}
/* double */