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

Fixed [ 794914 ] Wrong types in template specialization.

Browse source 
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@5060 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
Dave Beazley 2003-09-01 19:59:39 +00:00
commit 860baa7745
1 changed files with 43 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

43
SWIG/Source/CParse/templ.c
View file

@ -188,6 +188,25 @@ cparse_template_expand(Node *n, String *tname, String *rname, String *templatear
return 0; return 0;
} }
static
String *partial_arg(String *s, String *p) {
char *c;
String *prefix;
String *newarg;
/* Find the prefix on the partial argument */
c = Strstr(p,"$");
if (!c) {
return NewString(s);
}
prefix = NewStringWithSize(Char(p),c-Char(p));
newarg = NewString(s);
Replace(newarg,prefix,"",DOH_REPLACE_ANY | DOH_REPLACE_FIRST);
Delete(prefix);
return newarg;
}
int int
Swig_cparse_template_expand(Node *n, String *rname, ParmList *tparms) { Swig_cparse_template_expand(Node *n, String *rname, ParmList *tparms) {
List *patchlist, *cpatchlist, *typelist; List *patchlist, *cpatchlist, *typelist;
@ -211,6 +230,29 @@ Swig_cparse_template_expand(Node *n, String *rname, ParmList *tparms) {
tname = Copy(Getattr(n,"name")); tname = Copy(Getattr(n,"name"));
tbase = Swig_scopename_last(tname); tbase = Swig_scopename_last(tname);
/* Look for partial specialization matching */
if (Getattr(n,"partialargs")) {
Parm *p, *tp;
ParmList *ptargs = SwigType_function_parms(Getattr(n,"partialargs"));
p = ptargs;
tp = tparms;
while (p && tp) {
SwigType *ptype;
SwigType *tptype;
SwigType *partial_type;
ptype = Getattr(p,"type");
tptype = Getattr(tp,"type");
if (ptype && tptype) {
partial_type = partial_arg(tptype,ptype);
/* Printf(stdout,"partial '%s' '%s' ---> '%s'\n", tptype, ptype, partial_type); */
Setattr(tp,"type",partial_type);
}
p = nextSibling(p);
tp = nextSibling(tp);
}
assert(ParmList_len(ptargs) == ParmList_len(tparms));
}
if (0) { if (0) {
Parm *p = tparms; Parm *p = tparms;
while (p) { while (p) {
@ -502,3 +544,4 @@ Swig_cparse_template_locate(String *name, Parm *tparms) {
} }