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

use one line macro when possible

Browse source 
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@8768 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
Marcelo Matus 2006-02-10 08:14:58 +00:00
commit f5fa773e53
2 changed files with 8 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

6
SWIG/Lib/typemaps/fragments.swg
View file

@ -412,13 +412,11 @@ SWIG_AsVal_dec(Type)(SWIG_Object obj, Type *val)
}
%enddef
%define %numeric_signed_type_asval(Type, Base, Frag, Min, Max)
#define %numeric_signed_type_asval(Type, Base, Frag, Min, Max) \
%numeric_type_asval(Type, Base, Frag, (v < Min || v > Max))
%enddef
%define %numeric_unsigned_type_asval(Type, Base, Frag, Max)
#define %numeric_unsigned_type_asval(Type, Base, Frag, Max) \
%numeric_type_asval(Type, Base, Frag, (v > Max))
%enddef
/* Macro for 'signed long' derived types */

17
SWIG/Lib/typemaps/primtypes.swg
View file

@ -236,9 +236,7 @@ SWIG_CanCastAsInteger(double *d, double min, double max) {
* Generate the typemaps for primitive type
* ------------------------------------------------------------ */
%define %typemaps_primitive(Code, Type)
%typemaps_asvalfromn(%arg(Code), Type);
%enddef
#define %typemaps_primitive(Code, Type) %typemaps_asvalfromn(%arg(Code), Type)
/* ------------------------------------------------------------
* Primitive Type Macros
@ -248,9 +246,9 @@ SWIG_CanCastAsInteger(double *d, double min, double max) {
%define _apply_macro(macro, arg2, arg1...)
#if #arg1 != ""
macro(%arg(arg1),arg2);
macro(%arg(arg1),arg2);
#else
macro(arg2);
macro(arg2);
#endif
%enddef
@ -276,9 +274,8 @@ _apply_macro(Macro, ptrdiff_t , Arg2);
%enddef
/* apply the Macro2(Type1, Type2) to all C types */
%define %apply_ctypes_2(Macro2)
%apply_ctypes(%apply_ctypes, Macro2)
%enddef
#define %apply_ctypes_2(Macro2) %apply_ctypes(%apply_ctypes, Macro2)
/* apply the Macro(Type) to all C++ types */
%define %apply_cpptypes(Macro, Arg2...)
@ -291,9 +288,7 @@ _apply_macro(Macro, std::complex<double>, Arg2);
%enddef
/* apply the Macro2(Type1, Type2) to all C++ types */
%define %apply_cpptypes_2(Macro2)
%apply_cpptypes(%apply_cpptypes, Macro2)
%enddef
#define %apply_cpptypes_2(Macro2) %apply_cpptypes(%apply_cpptypes, Macro2)
/* apply the Macro2(CheckCode,Type) to all Checked Types */
%define %apply_checkctypes(Macro2)