[Swig-cvs] SWIG/Lib/typemaps cstrings.swg,1.6,1.7 enumint.swg,1.7,1.8 exception.swg,1.3,1.4 inoutlist.swg,1.10,1.11 primtypes.swg,1.10,1.11 ptrtypes.swg,1.9,1.10 strings.swg,1.14,1.15 swigtype.swg,1.17,1.18 swigtypemaps.swg,1.6,1.7 valtypes.swg,1.11,1.12 void.swg,1.10,1.11

[Marcelo M. <mar...@us...>]

Update of /cvsroot/swig/SWIG/Lib/typemaps
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12829/Lib/typemaps

Modified Files:
	cstrings.swg enumint.swg exception.swg inoutlist.swg 
	primtypes.swg ptrtypes.swg strings.swg swigtype.swg 
	swigtypemaps.swg valtypes.swg void.swg 
Log Message:
add  to %argument_fail

Index: inoutlist.swg
===================================================================
RCS file: /cvsroot/swig/SWIG/Lib/typemaps/inoutlist.swg,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** inoutlist.swg	30 Dec 2005 01:14:23 -0000	1.10
--- inoutlist.swg	2 Jan 2006 17:37:53 -0000	1.11
***************
*** 83,87 ****
        int ecode = asval_meth($input, &val);
        if (!SWIG_IsOK(ecode)) { 
! 	%argument_fail(ecode, "$*ltype",$argnum);
        }
        temp = %static_cast(val, $*ltype);
--- 83,87 ----
        int ecode = asval_meth($input, &val);
        if (!SWIG_IsOK(ecode)) { 
! 	%argument_fail(ecode, "$*ltype",$symname, $argnum);
        }
        temp = %static_cast(val, $*ltype);
***************
*** 95,99 ****
        int ecode = asval_meth($input, &val);
        if (!SWIG_IsOK(ecode)) { 
! 	%argument_fail(ecode, "$*ltype",$argnum);
        }
        temp = %static_cast(val, $*ltype);
--- 95,99 ----
        int ecode = asval_meth($input, &val);
        if (!SWIG_IsOK(ecode)) { 
! 	%argument_fail(ecode, "$*ltype",$symname, $argnum);
        }
        temp = %static_cast(val, $*ltype);
***************
*** 119,123 ****
      res = asptr_meth($input, &$1);
      if (!SWIG_IsOK(res)) {
!       %argument_fail(SWIG_TypeError,"$type",$argnum);
      }
      res = SWIG_AddTmpMask(res);
--- 119,123 ----
      res = asptr_meth($input, &$1);
      if (!SWIG_IsOK(res)) {
!       %argument_fail(SWIG_TypeError,"$type",$symname, $argnum);
      }
      res = SWIG_AddTmpMask(res);
***************
*** 126,133 ****
      res = asptr_meth($input, &$1);
      if (!SWIG_IsOK(res)) { 
!       %argument_fail(SWIG_TypeError,"$type",$argnum);
      }     
      if (!$1) { 
!       %argument_nullref("$type",$argnum);
      }
      res = SWIG_AddTmpMask(res);
--- 126,133 ----
      res = asptr_meth($input, &$1);
      if (!SWIG_IsOK(res)) { 
!       %argument_fail(SWIG_TypeError,"$type",$symname, $argnum);
      }     
      if (!$1) { 
!       %argument_nullref("$type",$symname, $argnum);
      }
      res = SWIG_AddTmpMask(res);

Index: strings.swg
===================================================================
RCS file: /cvsroot/swig/SWIG/Lib/typemaps/strings.swg,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** strings.swg	30 Dec 2005 01:14:24 -0000	1.14
--- strings.swg	2 Jan 2006 17:37:53 -0000	1.15
***************
*** 32,36 ****
    const Char * (Char *buf = 0, int alloc = 0) {
    if (!SWIG_IsOK(SWIG_AsCharPtr($input, &buf, &alloc))) {
!     %argument_fail(SWIG_TypeError,"$type",$argnum);
    }
    $1 = buf;
--- 32,36 ----
    const Char * (Char *buf = 0, int alloc = 0) {
    if (!SWIG_IsOK(SWIG_AsCharPtr($input, &buf, &alloc))) {
!     %argument_fail(SWIG_TypeError,"$type",$symname, $argnum);
    }
    $1 = buf;
***************
*** 42,46 ****
  %typemap(in,noblock=1,fragment=#SWIG_AsCharPtr) Char const*& (Char *buf = 0, int alloc = 0) {
    if (!SWIG_IsOK((SWIG_AsCharPtr($input, &buf, &alloc)))) {
!     %argument_fail(SWIG_TypeError,"$type",$argnum);
    }
    $1 = &temp;
--- 42,46 ----
  %typemap(in,noblock=1,fragment=#SWIG_AsCharPtr) Char const*& (Char *buf = 0, int alloc = 0) {
    if (!SWIG_IsOK((SWIG_AsCharPtr($input, &buf, &alloc)))) {
!     %argument_fail(SWIG_TypeError,"$type",$symname, $argnum);
    }
    $1 = &temp;
***************
*** 251,255 ****
  {  
    if (!SWIG_IsOK((SWIG_AsCharArray($input, temp, $1_dim0)))) {
!     %argument_fail(SWIG_TypeError,"$type",$argnum);
    }
    $1 = temp;
--- 251,255 ----
  {  
    if (!SWIG_IsOK((SWIG_AsCharArray($input, temp, $1_dim0)))) {
!     %argument_fail(SWIG_TypeError,"$type",$symname, $argnum);
    }
    $1 = temp;
***************
*** 260,264 ****
  {  
    if (!SWIG_IsOK((SWIG_AsCharArray($input, temp, $1_dim0)))) {
!     %argument_fail(SWIG_TypeError,"$type",$argnum);
    }
    $1 = &temp;
--- 260,264 ----
  {  
    if (!SWIG_IsOK((SWIG_AsCharArray($input, temp, $1_dim0)))) {
!     %argument_fail(SWIG_TypeError,"$type",$symname, $argnum);
    }
    $1 = &temp;
***************
*** 399,403 ****
  {
    if (!SWIG_IsOK((SWIG_AsCharPtrAndSize($input, &buf, &size, &alloc)))) { 
!     %argument_fail(SWIG_TypeError,"$type",$argnum);
    }  
    $1 = %static_cast(buf, $1_ltype);
--- 399,403 ----
  {
    if (!SWIG_IsOK((SWIG_AsCharPtrAndSize($input, &buf, &size, &alloc)))) { 
!     %argument_fail(SWIG_TypeError,"$type",$symname, $argnum);
    }  
    $1 = %static_cast(buf, $1_ltype);
***************
*** 418,422 ****
  {
    if (!SWIG_IsOK((SWIG_AsCharPtrAndSize($input, &buf, &size, &alloc)))) {
!     %argument_fail(SWIG_TypeError,"$type",$argnum);
    }
    $1 = %static_cast(buf, $1_ltype);
--- 418,422 ----
  {
    if (!SWIG_IsOK((SWIG_AsCharPtrAndSize($input, &buf, &size, &alloc)))) {
!     %argument_fail(SWIG_TypeError,"$type",$symname, $argnum);
    }
    $1 = %static_cast(buf, $1_ltype);
***************
*** 439,443 ****
  {
    if (!SWIG_IsOK((SWIG_AsCharPtrAndSize($input, &buf, &size, &alloc)))) { 
!     %argument_fail(SWIG_TypeError,"$type",$argnum);
    }  
    $2 = %static_cast(buf, $2_ltype) ;
--- 439,443 ----
  {
    if (!SWIG_IsOK((SWIG_AsCharPtrAndSize($input, &buf, &size, &alloc)))) { 
!     %argument_fail(SWIG_TypeError,"$type",$symname, $argnum);
    }  
    $2 = %static_cast(buf, $2_ltype) ;
***************
*** 457,461 ****
  {
    if (!SWIG_IsOK((SWIG_AsCharPtrAndSize($input, &buf, &size, &alloc)))) {
!     %argument_fail(SWIG_TypeError, "$type",$argnum);
    }
    $2 = %static_cast(buf, $2_ltype) ;
--- 457,461 ----
  {
    if (!SWIG_IsOK((SWIG_AsCharPtrAndSize($input, &buf, &size, &alloc)))) {
!     %argument_fail(SWIG_TypeError, "$type",$symname, $argnum);
    }
    $2 = %static_cast(buf, $2_ltype) ;

Index: cstrings.swg
===================================================================
RCS file: /cvsroot/swig/SWIG/Lib/typemaps/cstrings.swg,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** cstrings.swg	30 Dec 2005 01:14:23 -0000	1.6
--- cstrings.swg	2 Jan 2006 17:37:53 -0000	1.7
***************
*** 33,37 ****
    (Char *buf = 0, size_t size = 0, int alloc = 0)  {
    if (!SWIG_IsOK((SWIG_AsCharPtrAndSize($input, &buf, &size, &alloc)))) {
!     %argument_fail(SWIG_TypeError, "(TYPEMAP, SIZE)", $argnum);
    }
    $1 = ($1_ltype) buf;					       
--- 33,37 ----
    (Char *buf = 0, size_t size = 0, int alloc = 0)  {
    if (!SWIG_IsOK((SWIG_AsCharPtrAndSize($input, &buf, &size, &alloc)))) {
!     %argument_fail(SWIG_TypeError, "(TYPEMAP, SIZE)", $symname, $argnum);
    }
    $1 = ($1_ltype) buf;					       
***************
*** 116,120 ****
    (Char temp[MAX+1], Char *t = 0, size_t n = 0, int alloc = 0) {  
    if (!SWIG_IsOK((SWIG_AsCharPtrAndSize($input, &t, &n, &alloc)))) {
!     %argument_fail(SWIG_TypeError, "TYPEMAP", $argnum);
    }
    if ( n > (size_t) MAX ) n = (size_t) MAX;
--- 116,120 ----
    (Char temp[MAX+1], Char *t = 0, size_t n = 0, int alloc = 0) {  
    if (!SWIG_IsOK((SWIG_AsCharPtrAndSize($input, &t, &n, &alloc)))) {
!     %argument_fail(SWIG_TypeError, "TYPEMAP", $symname, $argnum);
    }
    if ( n > (size_t) MAX ) n = (size_t) MAX;
***************
*** 155,159 ****
  #endif
    if (!SWIG_IsOK((SWIG_AsCharPtrAndSize($input, &t, &n, &alloc)))) {
!     %argument_fail(SWIG_TypeError, "TYPEMAP", $argnum);
    }
    $1 = %new_array(n+expansion, $*1_ltype);          
--- 155,159 ----
  #endif
    if (!SWIG_IsOK((SWIG_AsCharPtrAndSize($input, &t, &n, &alloc)))) {
!     %argument_fail(SWIG_TypeError, "TYPEMAP", $symname, $argnum);
    }
    $1 = %new_array(n+expansion, $*1_ltype);          
***************
*** 184,188 ****
  %typemap(in,noblock=1,fragment=SWIG_AsVal_frag(size_t)) (TYPEMAP, SIZE) (size_t size, Char *buff = 0) {   
    if (!SWIG_IsOK((SWIG_AsVal(size_t)($input, &size)))) {
!     %argument_fail(SWIG_TypeError, "(TYPEMAP, SIZE)", $argnum);
    }
    buff= %new_array(size+1, Char);
--- 184,188 ----
  %typemap(in,noblock=1,fragment=SWIG_AsVal_frag(size_t)) (TYPEMAP, SIZE) (size_t size, Char *buff = 0) {   
    if (!SWIG_IsOK((SWIG_AsVal(size_t)($input, &size)))) {
!     %argument_fail(SWIG_TypeError, "(TYPEMAP, SIZE)", $symname, $argnum);
    }
    buff= %new_array(size+1, Char);
***************
*** 214,218 ****
  %typemap(in,noblock=1,fragment=SWIG_AsVal_frag(size_t)) (TYPEMAP, SIZE) (size_t n, Char *buff = 0, $*2_ltype size) {    
    if (!SWIG_IsOK((SWIG_AsVal(size_t)($input, &n)))) {
!     %argument_fail(SWIG_TypeError, "(TYPEMAP, SIZE)", $argnum);
    }
    buff= %new_array(n+1, Char);
--- 214,218 ----
  %typemap(in,noblock=1,fragment=SWIG_AsVal_frag(size_t)) (TYPEMAP, SIZE) (size_t n, Char *buff = 0, $*2_ltype size) {    
    if (!SWIG_IsOK((SWIG_AsVal(size_t)($input, &n)))) {
!     %argument_fail(SWIG_TypeError, "(TYPEMAP, SIZE)", $symname, $argnum);
    }
    buff= %new_array(n+1, Char);

Index: exception.swg
===================================================================
RCS file: /cvsroot/swig/SWIG/Lib/typemaps/exception.swg,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** exception.swg	24 Oct 2005 14:59:05 -0000	1.3
--- exception.swg	2 Jan 2006 17:37:53 -0000	1.4
***************
*** 4,14 ****
  
  /* macros for error manipulation */
! #define %nullref_fmt()                    "invalid null reference "		   
! #define %varfail_fmt(_type,_name)         "in variable '"_name"' of type '"_type"'"  	 		   
! #define %argfail_fmt(_type,_argn)         "in argument " #_argn" of type '" _type"'" 	 		   
! #define %outfail_fmt(_type)               "in output value of type '"_type"'"	   
! #define %argnullref_fmt(_type, _argn)     %nullref_fmt() %argfail_fmt(_type, _argn)  
! #define %varnullref_fmt(_type, _name)     %nullref_fmt() %varfail_fmt(_type, _name)  		   
! #define %outnullref_fmt(_type)            %nullref_fmt() %outfail_fmt(_type)         
  
  /* setting an error */
--- 4,14 ----
  
  /* macros for error manipulation */
! #define %nullref_fmt()                     "invalid null reference "		   
! #define %varfail_fmt(_type,_name)          "in variable '"`_name`"' of type '"`_type`"'"
! #define %argfail_fmt(_type,_name,_argn)    "in method '" `_name` "', argument " `_argn`" of type '" `_type`"'"
! #define %outfail_fmt(_type)                "in output value of type '"_type"'"	   
! #define %argnullref_fmt(_type,_name,_argn) %nullref_fmt() %argfail_fmt(_type, _name, _argn)  
! #define %varnullref_fmt(_type,_name)       %nullref_fmt() %varfail_fmt(_type, _name)  		   
! #define %outnullref_fmt(_type)             %nullref_fmt() %outfail_fmt(_type)         
  
  /* setting an error */

Index: void.swg
===================================================================
RCS file: /cvsroot/swig/SWIG/Lib/typemaps/void.swg,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** void.swg	30 Dec 2005 01:14:24 -0000	1.10
--- void.swg	2 Jan 2006 17:37:53 -0000	1.11
***************
*** 7,11 ****
  %typemap(in,noblock=1) void * {
    if (!SWIG_IsOK((SWIG_ConvertPtr($input,%as_voidptrptr(&$1), 0, $disown)))) { 
!     %argument_fail(SWIG_TypeError, "$type", $argnum); 
    }
  }
--- 7,11 ----
  %typemap(in,noblock=1) void * {
    if (!SWIG_IsOK((SWIG_ConvertPtr($input,%as_voidptrptr(&$1), 0, $disown)))) { 
!     %argument_fail(SWIG_TypeError, "$type", $symname, $argnum); 
    }
  }
***************
*** 14,18 ****
  %typemap(in,noblock=1) void * const& ($*ltype temp) {
    if (!SWIG_IsOK((SWIG_ConvertPtr($input, %as_voidptrptr(&temp), 0, $disown)))) { 
!     %argument_fail(SWIG_TypeError, "Stype", $argnum); 
    }
    $1 =  &temp;
--- 14,18 ----
  %typemap(in,noblock=1) void * const& ($*ltype temp) {
    if (!SWIG_IsOK((SWIG_ConvertPtr($input, %as_voidptrptr(&temp), 0, $disown)))) { 
!     %argument_fail(SWIG_TypeError, "Stype", $symname, $argnum); 
    }
    $1 =  &temp;

Index: ptrtypes.swg
===================================================================
RCS file: /cvsroot/swig/SWIG/Lib/typemaps/ptrtypes.swg,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** ptrtypes.swg	27 Dec 2005 22:06:26 -0000	1.9
--- ptrtypes.swg	2 Jan 2006 17:37:53 -0000	1.10
***************
*** 29,33 ****
      Type *ptr = (Type *)0;
      int res = asptr_meth($input, &ptr);
!     if (!SWIG_IsOK(res) || !ptr) { %argument_fail(SWIG_TypeError, "$type", $argnum); }
      $1 = *ptr;
      if (SWIG_IsNewObj(res)) %delete(ptr);
--- 29,33 ----
      Type *ptr = (Type *)0;
      int res = asptr_meth($input, &ptr);
!     if (!SWIG_IsOK(res) || !ptr) { %argument_fail(SWIG_TypeError, "$type", $symname, $argnum); }
      $1 = *ptr;
      if (SWIG_IsNewObj(res)) %delete(ptr);
***************
*** 37,42 ****
      Type *ptr = (Type *)0;
      res = asptr_meth($input, &ptr);
!     if (!SWIG_IsOK(res)) { %argument_fail(SWIG_TypeError,"$type",$argnum); }
!     if (!ptr) { %argument_nullref("$type",$argnum); }
      $1 = ptr;
    }
--- 37,42 ----
      Type *ptr = (Type *)0;
      res = asptr_meth($input, &ptr);
!     if (!SWIG_IsOK(res)) { %argument_fail(SWIG_TypeError,"$type",$symname, $argnum); }
!     if (!ptr) { %argument_nullref("$type",$symname, $argnum); }
      $1 = ptr;
    }

Index: valtypes.swg
===================================================================
RCS file: /cvsroot/swig/SWIG/Lib/typemaps/valtypes.swg,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** valtypes.swg	27 Dec 2005 22:06:26 -0000	1.11
--- valtypes.swg	2 Jan 2006 17:37:53 -0000	1.12
***************
*** 35,39 ****
      ecode = asval_meth($input, &val);
      if (!SWIG_IsOK(ecode)) {
!       %argument_fail(ecode, "$ltype", $argnum);
      } 
      $1 = %static_cast(val,$ltype);
--- 35,39 ----
      ecode = asval_meth($input, &val);
      if (!SWIG_IsOK(ecode)) {
!       %argument_fail(ecode, "$ltype", $symname, $argnum);
      } 
      $1 = %static_cast(val,$ltype);
***************
*** 43,47 ****
      ecode = asval_meth($input, &val);
      if (!SWIG_IsOK(ecode)) {
!       %argument_fail(ecode, "$*ltype", $argnum);
      } 
      temp = %static_cast(val, $*ltype);
--- 43,47 ----
      ecode = asval_meth($input, &val);
      if (!SWIG_IsOK(ecode)) {
!       %argument_fail(ecode, "$*ltype", $symname, $argnum);
      } 
      temp = %static_cast(val, $*ltype);

Index: swigtypemaps.swg
===================================================================
RCS file: /cvsroot/swig/SWIG/Lib/typemaps/swigtypemaps.swg,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** swigtypemaps.swg	1 Jan 2006 06:27:59 -0000	1.6
--- swigtypemaps.swg	2 Jan 2006 17:37:53 -0000	1.7
***************
*** 132,140 ****
   * ----------------------------------------------------------------------------- */
  
! #define %error_block(Block...)            %block(Block)
! #define %argument_fail(code, type, argn)  SWIG_exception(code, %argfail_fmt(type, argn))
! #define %argument_nullref(type, argn)     SWIG_exception(SWIG_ValueError, %argnullref_fmt(type, argn))
! #define %variable_fail(code, type, name)  SWIG_exception(code, %varfail_fmt(type, name))
! #define %variable_nullref(type, name)     SWIG_exception(SWIG_ValueError, %varnullref_fmt(type, name))
  
  #if defined(SWIG_DIRECTOR_TYPEMAPS)
--- 132,140 ----
   * ----------------------------------------------------------------------------- */
  
! #define %error_block(Block...)                 %block(Block)
! #define %argument_fail(code, type, name, argn) SWIG_exception(code, %argfail_fmt(type, name, argn))
! #define %argument_nullref(type, name, argn)    SWIG_exception(SWIG_ValueError, %argnullref_fmt(type, name, argn))
! #define %variable_fail(code, type, name)       SWIG_exception(code, %varfail_fmt(type, name))
! #define %variable_nullref(type, name)          SWIG_exception(SWIG_ValueError, %varnullref_fmt(type, name))
  
  #if defined(SWIG_DIRECTOR_TYPEMAPS)

Index: swigtype.swg
===================================================================
RCS file: /cvsroot/swig/SWIG/Lib/typemaps/swigtype.swg,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** swigtype.swg	30 Dec 2005 01:14:24 -0000	1.17
--- swigtype.swg	2 Jan 2006 17:37:53 -0000	1.18
***************
*** 6,10 ****
  %typemap(in, noblock=1) SWIGTYPE *(void  *argp = 0) {
    if (!SWIG_IsOK((SWIG_ConvertPtr($input, &argp,$descriptor, $disown | %convertptr_flags)))) { 
!     %argument_fail(SWIG_TypeError, "$type", $argnum); 
    }
    $1 = %reinterpret_cast(argp, $ltype);
--- 6,10 ----
  %typemap(in, noblock=1) SWIGTYPE *(void  *argp = 0) {
    if (!SWIG_IsOK((SWIG_ConvertPtr($input, &argp,$descriptor, $disown | %convertptr_flags)))) { 
!     %argument_fail(SWIG_TypeError, "$type", $symname, $argnum); 
    }
    $1 = %reinterpret_cast(argp, $ltype);
***************
*** 14,18 ****
  %typemap(in, noblock=1) SWIGTYPE [] (void *argp = 0) {
    if (!SWIG_IsOK((SWIG_ConvertPtr($input, &argp,$descriptor, $disown | %convertptr_flags)))) { 
!     %argument_fail(SWIG_TypeError, "$type", $argnum); 
    } 
    $1 = %reinterpret_cast(argp, $ltype);
--- 14,18 ----
  %typemap(in, noblock=1) SWIGTYPE [] (void *argp = 0) {
    if (!SWIG_IsOK((SWIG_ConvertPtr($input, &argp,$descriptor, $disown | %convertptr_flags)))) { 
!     %argument_fail(SWIG_TypeError, "$type", $symname, $argnum); 
    } 
    $1 = %reinterpret_cast(argp, $ltype);
***************
*** 23,27 ****
  %typemap(in, noblock=1) SWIGTYPE* const&  (void *argp = 0, $*ltype temp) {
    if (!SWIG_IsOK((SWIG_ConvertPtr($input, &argp, $*descriptor, $disown | %convertptr_flags)))) {
!     %argument_fail(SWIG_TypeError, "$*ltype", $argnum); 
    }
    temp = %reinterpret_cast(argp, $*ltype);
--- 23,27 ----
  %typemap(in, noblock=1) SWIGTYPE* const&  (void *argp = 0, $*ltype temp) {
    if (!SWIG_IsOK((SWIG_ConvertPtr($input, &argp, $*descriptor, $disown | %convertptr_flags)))) {
!     %argument_fail(SWIG_TypeError, "$*ltype", $symname, $argnum); 
    }
    temp = %reinterpret_cast(argp, $*ltype);
***************
*** 34,40 ****
  %typemap(in, noblock=1) SWIGTYPE & (void *argp = 0) {
    if (!SWIG_IsOK((SWIG_ConvertPtr($input, &argp, $descriptor, %convertptr_flags)))) {
!     %argument_fail(SWIG_TypeError, "$type", $argnum); 
    }
!   if (!argp) { %argument_nullref("$type", $argnum); }
    $1 = %reinterpret_cast(argp, $ltype);
  }
--- 34,40 ----
  %typemap(in, noblock=1) SWIGTYPE & (void *argp = 0) {
    if (!SWIG_IsOK((SWIG_ConvertPtr($input, &argp, $descriptor, %convertptr_flags)))) {
!     %argument_fail(SWIG_TypeError, "$type", $symname, $argnum); 
    }
!   if (!argp) { %argument_nullref("$type", $symname, $argnum); }
    $1 = %reinterpret_cast(argp, $ltype);
  }
***************
*** 45,51 ****
    res = SWIG_ConvertPtr($input, &argp, $descriptor, %convertptr_flags | %implicitconv_flag);
    if (!SWIG_IsOK(res)) {
!     %argument_fail(SWIG_TypeError, "$type", $argnum); 
    }
!   if (!argp) { %argument_nullref("$type", $argnum); }
    $1 = %reinterpret_cast(argp, $ltype);
  }
--- 45,51 ----
    res = SWIG_ConvertPtr($input, &argp, $descriptor, %convertptr_flags | %implicitconv_flag);
    if (!SWIG_IsOK(res)) {
!     %argument_fail(SWIG_TypeError, "$type", $symname, $argnum); 
    }
!   if (!argp) { %argument_nullref("$type", $symname, $argnum); }
    $1 = %reinterpret_cast(argp, $ltype);
  }
***************
*** 57,63 ****
  %typemap(in,noblock=1) const SWIGTYPE & (void *argp) {
    if (!SWIG_IsOK((SWIG_ConvertPtr($input, &argp, $descriptor, %convertptr_flags)))) {
!     %argument_fail(SWIG_TypeError, "$type", $argnum); 
    }
!   if (!argp) { %argument_nullref("$type", $argnum); }
    $1 = %reinterpret_cast(argp, $ltype);
  }
--- 57,63 ----
  %typemap(in,noblock=1) const SWIGTYPE & (void *argp) {
    if (!SWIG_IsOK((SWIG_ConvertPtr($input, &argp, $descriptor, %convertptr_flags)))) {
!     %argument_fail(SWIG_TypeError, "$type", $symname, $argnum); 
    }
!   if (!argp) { %argument_nullref("$type", $symname, $argnum); }
    $1 = %reinterpret_cast(argp, $ltype);
  }
***************
*** 70,77 ****
    int res = SWIG_ConvertPtr($input, &argp, $&descriptor, %convertptr_flags | %implicitconv_flag);
    if (!SWIG_IsOK(res)) {
!     %argument_fail(SWIG_TypeError, "$type", $argnum); 
    }  
    if (!argp) { 
!     %argument_nullref("$type", $argnum);
    } else {
      $&ltype temp = %reinterpret_cast(argp, $&ltype);
--- 70,77 ----
    int res = SWIG_ConvertPtr($input, &argp, $&descriptor, %convertptr_flags | %implicitconv_flag);
    if (!SWIG_IsOK(res)) {
!     %argument_fail(SWIG_TypeError, "$type", $symname, $argnum); 
    }  
    if (!argp) { 
!     %argument_nullref("$type", $symname, $argnum);
    } else {
      $&ltype temp = %reinterpret_cast(argp, $&ltype);
***************
*** 85,92 ****
    $&ltype temp;
    if (!SWIG_IsOK((SWIG_ConvertPtr($input, &argp, $&descriptor, %convertptr_flags)))) {
!     %argument_fail(SWIG_TypeError, "$type", $argnum); 
    }  
    if (!argp) { 
!     %argument_nullref("$type", $argnum);
    } else {
      $1 = *(%reinterpret_cast(argp, $&ltype));
--- 85,92 ----
    $&ltype temp;
    if (!SWIG_IsOK((SWIG_ConvertPtr($input, &argp, $&descriptor, %convertptr_flags)))) {
!     %argument_fail(SWIG_TypeError, "$type", $symname, $argnum); 
    }  
    if (!argp) { 
!     %argument_nullref("$type", $symname, $argnum);
    } else {
      $1 = *(%reinterpret_cast(argp, $&ltype));
***************
*** 452,456 ****
  %typemap(in,noblock=1) SWIGTYPE (CLASS::*) {  
    if (!SWIG_IsOK((SWIG_ConvertMember($input, %as_voidptr(&$1), sizeof($type),$descriptor)))) {
!     %argument_fail(SWIG_TypeError,"$type",$argnum); 
    }
  }
--- 452,456 ----
  %typemap(in,noblock=1) SWIGTYPE (CLASS::*) {  
    if (!SWIG_IsOK((SWIG_ConvertMember($input, %as_voidptr(&$1), sizeof($type),$descriptor)))) {
!     %argument_fail(SWIG_TypeError,"$type",$symname, $argnum); 
    }
  }
***************
*** 503,507 ****
  %typemap(in, noblock=1) SWIGTYPE ((*)(ANY)) {
    if (!SWIG_IsOK((SWIG_ConvertFunctionPtr($input, (void**)(&$1), $descriptor)))) {
!     %argument_fail(SWIG_TypeError,"$type",$argnum); 
    }
  }
--- 503,507 ----
  %typemap(in, noblock=1) SWIGTYPE ((*)(ANY)) {
    if (!SWIG_IsOK((SWIG_ConvertFunctionPtr($input, (void**)(&$1), $descriptor)))) {
!     %argument_fail(SWIG_TypeError,"$type",$symname, $argnum); 
    }
  }
***************
*** 563,567 ****
  %typemap(in, noblock=1) SWIGTYPE *DISOWN {
    if (!SWIG_IsOK((SWIG_ConvertPtr($input, %as_voidptrptr(&$1), $descriptor, SWIG_POINTER_DISOWN | %convertptr_flags)))) {
!     %argument_fail(SWIG_TypeError,"$type", $argnum);
    }
  }
--- 563,567 ----
  %typemap(in, noblock=1) SWIGTYPE *DISOWN {
    if (!SWIG_IsOK((SWIG_ConvertPtr($input, %as_voidptrptr(&$1), $descriptor, SWIG_POINTER_DISOWN | %convertptr_flags)))) {
!     %argument_fail(SWIG_TypeError,"$type", $symname, $argnum);
    }
  }

Index: primtypes.swg
===================================================================
RCS file: /cvsroot/swig/SWIG/Lib/typemaps/primtypes.swg,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** primtypes.swg	27 Dec 2005 22:06:26 -0000	1.10
--- primtypes.swg	2 Jan 2006 17:37:53 -0000	1.11
***************
*** 206,230 ****
    double x = *d;
    if (min <= x && x <= max) {
! %#ifdef SWIG_HAS_NO_RINT
!     /* Use the python mechanism to round, or so */
!     double rd = (x < 0) ? ceil(x) : floor(x);
! %#else
!     double rd = rint(x);
! %#endif
!     if ((errno == EDOM) || (errno == ERANGE)) {
!       errno = 0;
!     } else {
!       if (rd == x) {
! 	return 1;
!       } else {
! 	double diff = rd - x;
! 	double summ = rd + x;
! 	double reps = diff/summ;
! 	if (fabs(reps) < 8*DBL_EPSILON) {
! 	  *d = rd;
! 	  return 1;
! 	}
!       }
!     }
    }
    return 0;
--- 206,226 ----
    double x = *d;
    if (min <= x && x <= max) {
!    double fx = floor(x);   
!    double rd =  ((x - fx) < 0.5) ? fx : ceil(x); /* simple rint */
!    if ((errno == EDOM) || (errno == ERANGE)) {
!      errno = 0;
!    } else {
!      if (rd == x) {
!        return 1;
!      } else {
!        double diff = rd - x;
!        double summ = rd + x;
!        double reps = diff/summ;
!        if (fabs(reps) < 8*DBL_EPSILON) {
! 	 *d = rd;
! 	 return 1;
!        }
!      }
!    }
    }
    return 0;

Index: enumint.swg
===================================================================
RCS file: /cvsroot/swig/SWIG/Lib/typemaps/enumint.swg,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** enumint.swg	27 Dec 2005 22:06:26 -0000	1.7
--- enumint.swg	2 Jan 2006 17:37:53 -0000	1.8
***************
*** 9,13 ****
    ecode = SWIG_AsVal(int)($input, &val);
    if (!SWIG_IsOK(ecode)) {
!     %argument_fail(ecode, "$type", $argnum);
    } else {
      temp = %static_cast(val,$basetype);
--- 9,13 ----
    ecode = SWIG_AsVal(int)($input, &val);
    if (!SWIG_IsOK(ecode)) {
!     %argument_fail(ecode, "$type", $symname, $argnum);
    } else {
      temp = %static_cast(val,$basetype);