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

fix expansion for templates, ie from Type<(int)> to Type<int>

Browse source 
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@5686 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
Marcelo Matus 2004-01-25 09:22:35 +00:00
commit f2995151b1
1 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
SWIG/Source/Swig/typemap.c
View file

@ -768,7 +768,7 @@ void typemap_replace_vars(String *s, ParmList *locals, SwigType *type, String *p
{ {
SwigType *star_type, *amp_type, *base_type; SwigType *star_type, *amp_type, *base_type;
SwigType *ltype, *star_ltype, *amp_ltype; SwigType *ltype, *star_ltype, *amp_ltype;
String *mangle, *star_mangle, *amp_mangle, *base_mangle; String *mangle, *star_mangle, *amp_mangle, *base_mangle, *base_name;
String *descriptor, *star_descriptor, *amp_descriptor; String *descriptor, *star_descriptor, *amp_descriptor;
String *ts; String *ts;
char *sc; char *sc;
@ -948,13 +948,14 @@ void typemap_replace_vars(String *s, ParmList *locals, SwigType *type, String *p
base_type = SwigType_base(type); base_type = SwigType_base(type);
} }
base_name = SwigType_namestr(base_type);
if (index == 1) { if (index == 1) {
Replace(s,"$basetype", base_type, DOH_REPLACE_ANY); Replace(s,"$basetype", base_name, DOH_REPLACE_ANY);
replace_local_types(locals,"$basetype", base_type); replace_local_types(locals,"$basetype", base_name);
} }
strcpy(varname,"basetype"); strcpy(varname,"basetype");
Replace(s,var,base_type,DOH_REPLACE_ANY); Replace(s,var,base_type,DOH_REPLACE_ANY);
replace_local_types(locals,var,base_type); replace_local_types(locals,var,base_name);
base_mangle = SwigType_manglestr(base_type); base_mangle = SwigType_manglestr(base_type);
if (index == 1) if (index == 1)
@ -963,6 +964,7 @@ void typemap_replace_vars(String *s, ParmList *locals, SwigType *type, String *p
Replace(s,var,base_mangle,DOH_REPLACE_ANY); Replace(s,var,base_mangle,DOH_REPLACE_ANY);
Delete(base_mangle); Delete(base_mangle);
Delete(base_type); Delete(base_type);
Delete(base_name);
} }
/* Replace any $n. with (&n)-> */ /* Replace any $n. with (&n)-> */