From 09e6c0071b85eebabac480464993249a18afa682 Mon Sep 17 00:00:00 2001 From: Marcelo Matus Date: Thu, 13 Oct 2005 09:26:50 +0000 Subject: [PATCH] add proper default rule for function ptrs git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@7649 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- SWIG/Source/Swig/stype.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/SWIG/Source/Swig/stype.c b/SWIG/Source/Swig/stype.c index 55e78b500..627c0cfd1 100644 --- a/SWIG/Source/Swig/stype.c +++ b/SWIG/Source/Swig/stype.c @@ -394,7 +394,8 @@ SwigType *SwigType_default(SwigType *t) { #ifdef SWIG_NEW_TYPE_DEFAULT SwigType *nr = Copy(r); SwigType_del_pointer(nr); - def = NewStringf("p."); + def = SwigType_isfunction(nr) ? + NewStringf("") : NewStringf("p."); SwigType_add_default(def, nr); Delete(nr); #else @@ -454,6 +455,12 @@ SwigType *SwigType_default(SwigType *t) { } else { def = NewString("enum SWIGTYPE"); } + } else if (SwigType_isfunction(r)) { + if (Strcmp(r,"f(ANY).SWIGTYPE") == 0) { + def = NewString("p.SWIGTYPE"); + } else { + def = NewString("p.f(ANY).SWIGTYPE"); + } } else { def = NewString("SWIGTYPE"); }