summaryrefslogtreecommitdiff
path: root/Lib/ruby/rubyprimtypes.swg
diff options
context:
space:
mode:
Diffstat (limited to 'Lib/ruby/rubyprimtypes.swg')
-rw-r--r--Lib/ruby/rubyprimtypes.swg197
1 files changed, 42 insertions, 155 deletions
diff --git a/Lib/ruby/rubyprimtypes.swg b/Lib/ruby/rubyprimtypes.swg
index 41e0eb9b2..f1969cd1a 100644
--- a/Lib/ruby/rubyprimtypes.swg
+++ b/Lib/ruby/rubyprimtypes.swg
@@ -1,33 +1,30 @@
-%include <typemaps/primtypes.swg>
-
-/* Macro for 'signed long' derived types */
-
-%define %type_slong(Type, Frag, Min, Max)
-%derived_type_from(long, Type)
-%signed_derived_type_asval(long, Type, Frag, Min, Max)
-%enddef
-
-/* Macro for 'unsigned long' derived types */
-
-%define %type_ulong(Type, Frag, Max)
-%derived_type_from(unsigned long, Type)
-%unsigned_derived_type_asval(unsigned long, Type, Frag, Max)
-%enddef
-
/* ------------------------------------------------------------
* Primitive Types
* ------------------------------------------------------------ */
+/* auxiliar ruby fail method */
+
%fragment("SWIG_ruby_failed","header")
{
SWIGINTERN VALUE
SWIG_ruby_failed()
{
return Qnil;
+}
}
-
+
+%define %ruby_aux_method(Type, Method, Action)
+SWIGINTERN VALUE SWIG_AUX_##Method##(VALUE *args)
+{
+ VALUE obj = args[0];
+ VALUE type = TYPE(obj);
+ Type *res = (Type *)(args[1]);
+ *res = Action;
+ return obj;
}
+%enddef
+
/* boolean */
@@ -61,48 +58,24 @@ SWIG_AsVal_dec(bool)(VALUE obj, bool *val)
}
}
-/* signed/unsigned char */
-
-%type_slong(signed char, "<limits.h>", SCHAR_MIN, SCHAR_MAX)
-%type_ulong(unsigned char, "<limits.h>", UCHAR_MAX)
-
-/* short/unsigned short */
-
-%type_slong(short, "<limits.h>", SHRT_MIN, SHRT_MAX)
-%type_ulong(unsigned short, "<limits.h>", USHRT_MAX)
-
-/* int/unsigned int */
-
-%type_slong(int, "<limits.h>", INT_MIN, INT_MAX)
-%type_ulong(unsigned int, "<limits.h>", UINT_MAX)
-
-/* signed/unsigned wchar_t */
-
-#ifdef __cplusplus
-%type_slong(signed wchar_t, "<wchar.h>", WCHAR_MIN, WCHAR_MAX)
-%type_ulong(unsigned wchar_t, "<wchar.h>", UWCHAR_MAX)
-#endif
-
/* long */
%fragment(SWIG_From_frag(long),"header",
fragment="<limits.h>") {
- SWIG_define(SWIG_From_dec(long), LONG2NUM)
+ %define_as(SWIG_From_dec(long), LONG2NUM)
}
%fragment(SWIG_AsVal_frag(long),"header",fragment="SWIG_ruby_failed") {
-SWIGINTERN VALUE SWIG_num2long(VALUE *args)
-{
- *((long *)(args[1])) = NUM2LONG(args[0]);
- return args[0];
-}
+%ruby_aux_method(long, NUM2LONG, type == T_FIXNUM ? NUM2LONG(obj) : rb_big2long(obj))
+
SWIGINTERN int
SWIG_AsVal_dec(long)(VALUE obj, long* val)
{
- if (obj != Qnil && ((TYPE(obj) == T_FIXNUM) || (TYPE(obj) == T_BIGNUM))) {
+ VALUE type = TYPE(obj);
+ if ((type == T_FIXNUM) || (type == T_BIGNUM)) {
long v;
VALUE a[2] = { obj, (VALUE)(&v) };
- if (rb_rescue(RUBY_METHOD_FUNC(SWIG_num2long), (VALUE)a, RUBY_METHOD_FUNC(SWIG_ruby_failed), 0) != Qnil) {
+ if (rb_rescue(RUBY_METHOD_FUNC(SWIG_AUX_NUM2LONG), (VALUE)a, RUBY_METHOD_FUNC(SWIG_ruby_failed), 0) != Qnil) {
if (val) *val = v;
return SWIG_OK;
}
@@ -123,18 +96,16 @@ SWIG_From_dec(unsigned long)(unsigned long value)
}
%fragment(SWIG_AsVal_frag(unsigned long),"header",fragment="SWIG_ruby_failed") {
-SWIGINTERN VALUE SWIG_num2ulong(VALUE *args)
-{
- *((unsigned long *)(args[1])) = NUM2ULONG(args[0]);
- return args[0];
-}
+%ruby_aux_method(unsigned long, NUM2ULONG, type == T_FIXNUM ? NUM2ULONG(obj) : rb_big2ulong(obj))
+
SWIGINTERN int
SWIG_AsVal_dec(unsigned long)(VALUE obj, unsigned long *val)
{
- if (obj != Qnil && ((TYPE(obj) == T_FIXNUM) || (TYPE(obj) == T_BIGNUM))) {
+ VALUE type = TYPE(obj);
+ if ((type == T_FIXNUM) || (type == T_BIGNUM)) {
unsigned long v;
VALUE a[2] = { obj, (VALUE)(&v) };
- if (rb_rescue(RUBY_METHOD_FUNC(SWIG_num2ulong), (VALUE)a, RUBY_METHOD_FUNC(SWIG_ruby_failed), 0) != Qnil) {
+ if (rb_rescue(RUBY_METHOD_FUNC(SWIG_AUX_NUM2ULONG), (VALUE)a, RUBY_METHOD_FUNC(SWIG_ruby_failed), 0) != Qnil) {
if (val) *val = v;
return SWIG_OK;
}
@@ -156,18 +127,16 @@ SWIG_From_dec(long long)(long long value)
}
%fragment(SWIG_AsVal_frag(long long),"header",fragment="SWIG_ruby_failed") {
-SWIGINTERN VALUE SWIG_num2longlong(VALUE *args)
-{
- *((long long *)(args[1])) = NUM2LL(args[0]);
- return args[0];
-}
+%ruby_aux_method(long long, NUM2LL, type == T_FIXNUM ? NUM2LL(obj) : rb_big2ll(obj))
+
SWIGINTERN int
SWIG_AsVal_dec(long long)(VALUE obj, long long *val)
{
- if (obj != Qnil && ((TYPE(obj) == T_FIXNUM) || (TYPE(obj) == T_BIGNUM))) {
+ VALUE type = TYPE(obj);
+ if ((type == T_FIXNUM) || (type == T_BIGNUM)) {
long long v;
VALUE a[2] = { obj, (VALUE)(&v) };
- if (rb_rescue(RUBY_METHOD_FUNC(SWIG_num2longlong), (VALUE)a, RUBY_METHOD_FUNC(SWIG_ruby_failed), 0) != Qnil) {
+ if (rb_rescue(RUBY_METHOD_FUNC(SWIG_AUX_NUM2LL), (VALUE)a, RUBY_METHOD_FUNC(SWIG_ruby_failed), 0) != Qnil) {
if (val) *val = v;
return SWIG_OK;
}
@@ -189,18 +158,16 @@ SWIG_From_dec(unsigned long long)(unsigned long long value)
}
%fragment(SWIG_AsVal_frag(unsigned long long),"header",fragment="SWIG_ruby_failed") {
-SWIGINTERN VALUE SWIG_num2ulonglong(VALUE *args)
-{
- *((unsigned long long *)(args[1])) = NUM2ULL(args[0]);
- return args[0];
-}
+%ruby_aux_method(long long, NUM2ULL, type == T_FIXNUM ? NUM2ULL(obj) : rb_big2ull(obj))
+
SWIGINTERN int
SWIG_AsVal_dec(unsigned long long)(VALUE obj, unsigned long long *val)
-{
- if (obj != Qnil && ((TYPE(obj) == T_FIXNUM) || (TYPE(obj) == T_BIGNUM))) {
+{
+ VALUE type = TYPE(obj);
+ if ((type == T_FIXNUM) || (type == T_BIGNUM)) {
unsigned long long v;
VALUE a[2] = { obj, (VALUE)(&v) };
- if (rb_rescue(RUBY_METHOD_FUNC(SWIG_num2ulonglong), (VALUE)a, RUBY_METHOD_FUNC(SWIG_ruby_failed), 0) != Qnil) {
+ if (rb_rescue(RUBY_METHOD_FUNC(SWIG_AUX_NUM2ULL), (VALUE)a, RUBY_METHOD_FUNC(SWIG_ruby_failed), 0) != Qnil) {
if (val) *val = v;
return SWIG_OK;
}
@@ -209,30 +176,23 @@ SWIG_AsVal_dec(unsigned long long)(VALUE obj, unsigned long long *val)
}
}
-/* float */
-
-%derived_type_from(double, float)
-%signed_derived_type_asval(double, float, "<float.h>", -FLT_MAX, FLT_MAX)
-
/* double */
%fragment(SWIG_From_frag(double),"header") {
- SWIG_define(SWIG_From_dec(double), rb_float_new)
+ %define_as(SWIG_From_dec(double), rb_float_new)
}
%fragment(SWIG_AsVal_frag(double),"header",fragment="SWIG_ruby_failed") {
-SWIGINTERN VALUE SWIG_num2dbl(VALUE *args)
-{
- *((double *)(args[1])) = NUM2DBL(args[0]);
- return args[0];
-}
+%ruby_aux_method(double, NUM2DBL, (type == T_FLOAT ? NUM2DBL(obj) : (type == T_FIXNUM ? (double) FIX2INT(obj) : rb_big2dbl(obj))))
+
SWIGINTERN int
SWIG_AsVal_dec(double)(VALUE obj, double *val)
{
- if (obj != Qnil &&((TYPE(obj) == T_FLOAT) || (TYPE(obj) == T_FIXNUM) || (TYPE(obj) == T_BIGNUM))) {
+ VALUE type = TYPE(obj);
+ if ((type == T_FLOAT) || (type == T_FIXNUM) || (type == T_BIGNUM)) {
double v;
VALUE a[2] = { obj, (VALUE)(&v) };
- if (rb_rescue(RUBY_METHOD_FUNC(SWIG_num2dbl), (VALUE)a, RUBY_METHOD_FUNC(SWIG_ruby_failed), 0) != Qnil) {
+ if (rb_rescue(RUBY_METHOD_FUNC(SWIG_AUX_NUM2DBL), (VALUE)a, RUBY_METHOD_FUNC(SWIG_ruby_failed), 0) != Qnil) {
if (val) *val = v;
return SWIG_OK;
}
@@ -241,77 +201,4 @@ SWIG_AsVal_dec(double)(VALUE obj, double *val)
}
}
-/* char */
-
-%fragment(SWIG_From_frag(char),"header") {
-SWIGINTERNINLINE VALUE
-SWIG_From_dec(char)(char c)
-{
- return rb_str_new(&c,1);
-}
-}
-
-%fragment(SWIG_AsVal_frag(char),"header",
- fragment="SWIG_AsCharArray",
- fragment=SWIG_AsVal_frag(signed char)) {
-SWIGINTERN int
-SWIG_AsVal_dec(char)(VALUE obj, char *val)
-{
- signed char v;
- if (SWIG_AsVal(signed char)(obj, &v) == SWIG_OK) {
- if (val) *val = (char)(v);
- return SWIG_OK;
- } else {
- if (SWIG_AsCharArray(obj, val, 1) == SWIG_OK) {
- return SWIG_OK;
- }
- }
- return SWIG_TypeError;
- }
-}
-
-/* wchar_t */
-
-
-%fragment(SWIG_From_frag(wchar_t),"header",
- fragment=SWIG_From_frag(char),
- fragment=SWIG_From_frag(long)) {
-SWIGINTERNINLINE VALUE
-SWIG_From_dec(wchar_t)(wchar_t c)
-{
- if (CHAR_MIN <= v && v <= CHAR_MAX) {
- return SWIG_From(char)((char)c);
- } else {
- return SWIG_From(long)((long)c);
- }
-}
-}
-
-%fragment(SWIG_AsVal_frag(wchar_t),"header",
- fragment="SWIG_AsWCharArray",
- fragment=SWIG_AsVal_frag(long)) {
-SWIGINTERN int
-SWIG_AsVal_dec(wchar_t)(VALUE obj, wchar_t *val)
-{
- char v;
- if (SWIG_AsVal(char)(obj, &v) == SWIG_OK) {
- if (val) *val = (wchar_t)(v);
- return SWIG_OK;
- } else {
- long v;
- if (SWIG_AsVal(long)(obj, &v) == SWIG_OK) {
- if (WCHAR_MIN <= v && v <= WCHAR_MAX) {
- if (val) *val = (wchar_t)(v);
- return SWIG_OK;
- }
- }
- }
- return SWIG_TypeError;
-}
-}
-
-/* ------------------------------------------------------------
- * Apply the primitive typemap for all the types with checkcode
- * ------------------------------------------------------------ */
-%apply_checkctypes(%typemap_primitive)