From: Marcelo M. <mar...@us...> - 2004-10-29 22:25:29
|
Update of /cvsroot/swig/SWIG/Lib/python In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2916 Modified Files: pyinout.swg pyptrtypes.swg pyswigtype.swg Log Message: don't use in error messages, it can generate extra entries in the symbol table Index: pyptrtypes.swg =================================================================== RCS file: /cvsroot/swig/SWIG/Lib/python/pyptrtypes.swg,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** pyptrtypes.swg 2 Oct 2004 20:15:46 -0000 1.7 --- pyptrtypes.swg 29 Oct 2004 22:25:18 -0000 1.8 *************** *** 12,18 **** if (!res) { if (!PyErr_Occurred()) ! SWIG_type_error(SWIG_TypePrettyName($&1_descriptor), $input); } else if (!ptr) { ! SWIG_null_ref(SWIG_TypePrettyName($&1_descriptor)); } if (SWIG_arg_fail($argnum)) SWIG_fail; --- 12,18 ---- if (!res) { if (!PyErr_Occurred()) ! SWIG_type_error("$basetype", $input); } else if (!ptr) { ! SWIG_null_ref("$basetype"); } if (SWIG_arg_fail($argnum)) SWIG_fail; *************** *** 25,31 **** if (!res) { if (!PyErr_Occurred()) ! SWIG_type_error(SWIG_TypePrettyName($1_descriptor), $input); } else if (!ptr) { ! SWIG_null_ref(SWIG_TypePrettyName($1_descriptor)); } if (SWIG_arg_fail($argnum)) SWIG_fail; --- 25,31 ---- if (!res) { if (!PyErr_Occurred()) ! SWIG_type_error("$basetype", $input); } else if (!ptr) { ! SWIG_null_ref("$basetype"); } if (SWIG_arg_fail($argnum)) SWIG_fail; *************** *** 45,53 **** if (!res) { if (!PyErr_Occurred()) ! SWIG_type_error(SWIG_TypePrettyName($1_descriptor), $input); SWIG_append_msg(" C/C++ variable '$name'"); return 1; } else if (!ptr) { ! SWIG_null_ref(SWIG_TypePrettyName($1_descriptor)); SWIG_append_msg(" C/C++ variable '$name'"); return 1; --- 45,53 ---- if (!res) { if (!PyErr_Occurred()) ! SWIG_type_error("$basetype", $input); SWIG_append_msg(" C/C++ variable '$name'"); return 1; } else if (!ptr) { ! SWIG_null_ref("$basetype"); SWIG_append_msg(" C/C++ variable '$name'"); return 1; Index: pyinout.swg =================================================================== RCS file: /cvsroot/swig/SWIG/Lib/python/pyinout.swg,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** pyinout.swg 2 Oct 2004 01:43:16 -0000 1.5 --- pyinout.swg 29 Oct 2004 22:25:18 -0000 1.6 *************** *** 66,70 **** } if (!$1) { ! SWIG_null_ref(SWIG_TypePrettyName($1_descriptor)); } if (SWIG_arg_fail($argnum)) SWIG_fail; --- 66,70 ---- } if (!$1) { ! SWIG_null_ref("$basetype"); } if (SWIG_arg_fail($argnum)) SWIG_fail; *************** *** 80,87 **** res = asptr_meth($input, &$1); if (!res) { ! SWIG_type_error(SWIG_TypePrettyName($1_descriptor), $input); } else { if (!$1) { ! SWIG_null_ref(SWIG_TypePrettyName($1_descriptor)); } } --- 80,87 ---- res = asptr_meth($input, &$1); if (!res) { ! SWIG_type_error("$basetype", $input); } else { if (!$1) { ! SWIG_null_ref("$basetype"); } } *************** *** 92,99 **** res = asptr_meth($input, &$1); if (!res) { ! SWIG_type_error(SWIG_TypePrettyName($1_descriptor), $input); } else { if (!$1) { ! SWIG_null_ref(SWIG_TypePrettyName($1_descriptor)); } } --- 92,99 ---- res = asptr_meth($input, &$1); if (!res) { ! SWIG_type_error("$basetype", $input); } else { if (!$1) { ! SWIG_null_ref("$basetype"); } } Index: pyswigtype.swg =================================================================== RCS file: /cvsroot/swig/SWIG/Lib/python/pyswigtype.swg,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** pyswigtype.swg 25 Oct 2004 19:04:51 -0000 1.12 --- pyswigtype.swg 29 Oct 2004 22:25:18 -0000 1.13 *************** *** 20,30 **** /* Additional check for null references */ ! %typemap(in) SWIGTYPE & ! "SWIG_Python_ConvertPtr($input, (void **)&$1, $descriptor, SWIG_POINTER_EXCEPTION | $disown); if (SWIG_arg_fail($argnum)) SWIG_fail; if ($1 == NULL) { ! SWIG_null_ref(SWIG_TypePrettyName($descriptor)); } ! if (SWIG_arg_fail($argnum)) SWIG_fail;"; /* Object passed by value. Convert to a pointer */ --- 20,32 ---- /* Additional check for null references */ ! %typemap(in) SWIGTYPE & { ! SWIG_Python_ConvertPtr($input, (void **)&$1, $descriptor, SWIG_POINTER_EXCEPTION | $disown); if (SWIG_arg_fail($argnum)) SWIG_fail; if ($1 == NULL) { ! SWIG_null_ref("$basetype"); } ! if (SWIG_arg_fail($argnum)) SWIG_fail; ! } ! /* Object passed by value. Convert to a pointer */ *************** *** 34,38 **** if (SWIG_arg_fail($argnum)) SWIG_fail; if (argp == NULL) { ! SWIG_null_ref(SWIG_TypePrettyName($&descriptor)); } if (SWIG_arg_fail($argnum)) SWIG_fail; --- 36,40 ---- if (SWIG_arg_fail($argnum)) SWIG_fail; if (argp == NULL) { ! SWIG_null_ref("$basetype"); } if (SWIG_arg_fail($argnum)) SWIG_fail; *************** *** 42,51 **** /* Pointer to a class member */ ! %typemap(in) SWIGTYPE (CLASS::*) ! "if ((SWIG_ConvertPacked($input,(void *)(&$1),sizeof($type),$descriptor,0)) == -1) { ! SWIG_type_error(SWIG_TypePrettyName($descriptor),$input); } ! if (SWIG_arg_fail($argnum)) SWIG_fail; ! "; --- 44,54 ---- /* Pointer to a class member */ ! %typemap(in) SWIGTYPE (CLASS::*) { ! if ((SWIG_ConvertPacked($input,(void *)(&$1),sizeof($type),$descriptor,0)) == -1) { ! SWIG_type_error("$basetype",$input); } ! if (SWIG_arg_fail($argnum)) SWIG_fail; ! } ! |