From 77eabe05e21ce283b9dd749de2952f0115b394e2 Mon Sep 17 00:00:00 2001 From: Ted Ross Date: Mon, 24 Aug 2009 15:55:14 +0000 Subject: Added QMF tests for method invocation and numeric types. Improved the swig typemaps to handle different numeric cases. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@807288 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/bindings/qmf/ruby/ruby.i | 33 +++++++++++++++++++++++++++++++-- 1 file changed, 31 insertions(+), 2 deletions(-) (limited to 'qpid/cpp/bindings/qmf/ruby/ruby.i') diff --git a/qpid/cpp/bindings/qmf/ruby/ruby.i b/qpid/cpp/bindings/qmf/ruby/ruby.i index a8a2a87a97..8c2da1b494 100644 --- a/qpid/cpp/bindings/qmf/ruby/ruby.i +++ b/qpid/cpp/bindings/qmf/ruby/ruby.i @@ -43,7 +43,10 @@ %typemap (in) uint32_t { - $1 = NUM2UINT ($input); + if (TYPE($input) == T_BIGNUM) + $1 = NUM2UINT($input); + else + $1 = FIX2UINT($input); } %typemap (out) uint32_t @@ -51,6 +54,19 @@ $result = UINT2NUM((unsigned int) $1); } +%typemap (in) int32_t +{ + if (TYPE($input) == T_BIGNUM) + $1 = NUM2INT($input); + else + $1 = FIX2INT($input); +} + +%typemap (out) int32_t +{ + $result = INT2NUM((int) $1); +} + %typemap (typecheck, precedence=SWIG_TYPECHECK_INTEGER) uint32_t { $1 = FIXNUM_P($input); } @@ -62,7 +78,20 @@ %typemap (out) uint64_t { - $result = ULONG2NUM((unsigned long) $1); + $result = ULONG2NUM((long) $1); +} + +%typemap (in) int64_t +{ + if (TYPE($input) == T_BIGNUM) + $1 = NUM2LONG($input); + else + $1 = FIX2LONG($input); +} + +%typemap (out) int64_t +{ + $result = LONG2NUM((long) $1); } %typemap (typecheck, precedence=SWIG_TYPECHECK_INTEGER) uint64_t { -- cgit v1.2.1