diff options
author | Marcelo Matus <mmatus@acms.arizona.edu> | 2006-01-16 23:27:11 +0000 |
---|---|---|
committer | Marcelo Matus <mmatus@acms.arizona.edu> | 2006-01-16 23:27:11 +0000 |
commit | 526be12c1e8ffb33ab7088e81e364e345cc503dc (patch) | |
tree | 1a8d5c5e50f67752879c4d1f06c50233ce44c7da /Lib/swig.swg | |
parent | 5949320325a0a0021b71c84eda6b2d8205b0c1b9 (diff) | |
download | swig-526be12c1e8ffb33ab7088e81e364e345cc503dc.tar.gz |
change the %rename predicates to use the prefix %$ and avoid clashings with other rename directives
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk/SWIG@8469 626c5289-ae23-0410-ae9c-e8d60b6d4f22
Diffstat (limited to 'Lib/swig.swg')
-rw-r--r-- | Lib/swig.swg | 90 |
1 files changed, 46 insertions, 44 deletions
diff --git a/Lib/swig.swg b/Lib/swig.swg index 7136a7b9e..2485d9e4d 100644 --- a/Lib/swig.swg +++ b/Lib/swig.swg @@ -213,63 +213,65 @@ static int NAME(TYPE x) { - to rename all the functions: - %rename("%(utitle)s", %isfunction) ""; + %rename("%(utitle)s", %$isfunction) ""; - to rename only the member methods: - %rename("m_%(utitle)s", %isfunction, %ismember) ""; + %rename("m_%(utitle)s", %$isfunction, %$ismember) ""; - to rename only the global functions: - %rename("g_%(utitle)s", %isfunction, %isglobal) ""; + %rename("g_%(utitle)s", %$isfunction, %$isglobal) ""; - to ignore the enumitems in a given class: - %rename("$ignore", %isenumitem, %classname="MyClass") ""; + %rename("$ignore", %$isenumitem, %$classname="MyClass") ""; + we use the prefix '%$' to avoid clashings with other swig + macros/directives. */ -%define %not "not" %enddef -%define %isenum "match"="enum" %enddef -%define %isenumitem "match"="enumitem" %enddef -%define %isaccess "match"="access" %enddef -%define %isclass "match"="class" %enddef -%define %isextend "match"="extend" %enddef -%define %isextend "match"="extend" %enddef -%define %isconstructor "match"="constructor" %enddef -%define %isdestructor "match"="destructor" %enddef -%define %isnamespace "match"="namespace" %enddef -%define %istemplate "match"="template" %enddef -%define %isconstant "match"="constant" %enddef /* %constant definition */ - -%define %isunion "match$kind"="union" %enddef -%define %isfunction "match$kind"="function" %enddef -%define %isvariable "match$kind"="variable" %enddef -%define %isimmutable "match$feature:immutable"="1" %enddef -%define %hasconsttype "match$hasconsttype"="1" %enddef -%define %hasvalue "match$hasvalue"="1" %enddef -%define %isextension "match$isextension"="1" %enddef - -%define %isstatic "match$storage"="static" %enddef -%define %isfriend "match$storage"="friend" %enddef -%define %istypedef "match$storage"="typedef" %enddef -%define %isvirtual "match$storage"="virtual" %enddef -%define %isexplicit "match$storage"="explicit" %enddef -%define %isextern "match$storage"="extern" %enddef - -%define %ismember "match$ismember"="1" %enddef -%define %isglobal %not %ismember %enddef -%define %innamespace "match$parentNode$nodeType"="namespace" %enddef - -%define %ispublic "match$access"="public" %enddef -%define %isprotected "match$access"="protected" %enddef -%define %isprivate "match$access"="public" %enddef - -%define %ismemberget "match$memberget"="1" %enddef -%define %ismemberset "match$memberset"="1" %enddef - -%define %classname %ismember,match$parentNode$name %enddef +%define %$not "not" %enddef +%define %$isenum "match"="enum" %enddef +%define %$isenumitem "match"="enumitem" %enddef +%define %$isaccess "match"="access" %enddef +%define %$isclass "match"="class" %enddef +%define %$isextend "match"="extend" %enddef +%define %$isextend "match"="extend" %enddef +%define %$isconstructor "match"="constructor" %enddef +%define %$isdestructor "match"="destructor" %enddef +%define %$isnamespace "match"="namespace" %enddef +%define %$istemplate "match"="template" %enddef +%define %$isconstant "match"="constant" %enddef /* %constant definition */ + +%define %$isunion "match$kind"="union" %enddef +%define %$isfunction "match$kind"="function" %enddef +%define %$isvariable "match$kind"="variable" %enddef +%define %$isimmutable "match$feature:immutable"="1" %enddef +%define %$hasconsttype "match$hasconsttype"="1" %enddef +%define %$hasvalue "match$hasvalue"="1" %enddef +%define %$isextension "match$isextension"="1" %enddef + +%define %$isstatic "match$storage"="static" %enddef +%define %$isfriend "match$storage"="friend" %enddef +%define %$istypedef "match$storage"="typedef" %enddef +%define %$isvirtual "match$storage"="virtual" %enddef +%define %$isexplicit "match$storage"="explicit" %enddef +%define %$isextern "match$storage"="extern" %enddef + +%define %$ismember "match$ismember"="1" %enddef +%define %$isglobal %not %ismember %enddef +%define %$innamespace "match$parentNode$nodeType"="namespace" %enddef + +%define %$ispublic "match$access"="public" %enddef +%define %$isprotected "match$access"="protected" %enddef +%define %$isprivate "match$access"="public" %enddef + +%define %$ismemberget "match$memberget"="1" %enddef +%define %$ismemberset "match$memberset"="1" %enddef + +%define %$classname %ismember,match$parentNode$name %enddef /* ----------------------------------------------------------------------------- * Include all the warnings labels and macros |