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

add 'init' method plus keys to use with Getattr

Browse source 
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk/SWIG@7885 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
Marcelo Matus 2005-11-27 02:57:03 +00:00
commit 9398e533f7
1 changed files with 189 additions and 112 deletions
Download patch file Download diff file Expand all files Collapse all files

301
Source/CParse/templ.c
View file

@ -16,10 +16,84 @@ char cvsroot_templ_c[] = "$Header$";
static int template_debug = 0; static int template_debug = 0;
static String *k_baselist = 0;
static String *k_cdecl = 0;
static String *k_class = 0;
static String *k_code = 0;
static String *k_constructor = 0;
static String *k_conversionoperator = 0;
static String *k_decl = 0;
static String *k_destructor = 0;
static String *k_error = 0;
static String *k_kwargs = 0;
static String *k_name = 0;
static String *k_namespace = 0;
static String *k_nodetype = 0;
static String *k_parms = 0;
static String *k_partialargs = 0;
static String *k_partials = 0;
static String *k_pattern = 0;
static String *k_privatebaselist = 0;
static String *k_protectedbaselist = 0;
static String *k_symname = 0;
static String *k_symnextSibling = 0;
static String *k_symsymtab = 0;
static String *k_template = 0;
static String *k_templateparms = 0;
static String *k_templatetype = 0;
static String *k_throws = 0;
static String *k_type = 0;
static String *k_typedef = 0;
static String *k_uname = 0;
static String *k_using = 0;
static String *k_value = 0;
String *baselists[3];
void SwigType_template_init()
{
k_baselist = NewString("baselist");
k_cdecl = NewString("cdecl");
k_class = NewString("class");
k_code = NewString("code");
k_constructor = NewString("constructor");
k_conversionoperator = NewString("conversion_operator");
k_decl = NewString("decl");
k_destructor = NewString("destructor");
k_error = NewString("error");
k_kwargs = NewString("kwargs");
k_name = NewString("name");
k_namespace = NewString("namespace");
k_nodetype = NewString("nodeType");
k_parms = NewString("parms");
k_partialargs = NewString("partialargs");
k_partials = NewString("partials");
k_pattern = NewString("pattern");
k_privatebaselist = NewString("privatebaselist");
k_protectedbaselist = NewString("protectedbaselist");
k_symname = NewString("sym:name");
k_symnextSibling = NewString("sym:nextSibling");
k_symsymtab = NewString("sym:symtab");
k_template = NewString("template");
k_templateparms = NewString("templateparms");
k_templatetype = NewString("templatetype");
k_throws = NewString("throws");
k_type = NewString("type");
k_typedef = NewString("typedef");
k_uname = NewString("uname");
k_using = NewString("using");
k_value = NewString("value");
baselists[0] = k_baselist;
baselists[1] = k_protectedbaselist;
baselists[2] = k_privatebaselist;
}
static void add_parms(ParmList *p, List *patchlist, List *typelist) { static void add_parms(ParmList *p, List *patchlist, List *typelist) {
while (p) { while (p) {
SwigType *ty = Getattr(p,"type"); SwigType *ty = Getattr(p,k_type);
SwigType *val = Getattr(p,"value"); SwigType *val = Getattr(p,k_value);
Append(typelist,ty); Append(typelist,ty);
Append(typelist,val); Append(typelist,val);
Append(patchlist,val); Append(patchlist,val);
@ -43,15 +117,15 @@ static int
cparse_template_expand(Node *n, String *tname, String *rname, String *templateargs, List *patchlist, List *typelist, List *cpatchlist) { cparse_template_expand(Node *n, String *tname, String *rname, String *templateargs, List *patchlist, List *typelist, List *cpatchlist) {
static int expanded = 0; static int expanded = 0;
int ret; int ret;
String *nodeType = Getattr(n,k_nodetype);
if (!n) return 0; if (!n) return 0;
if (Getattr(n,"error")) return 0; if (Getattr(n,k_error)) return 0;
if (Strcmp(nodeType(n),"template") == 0) { if (Strcmp(nodeType,k_template) == 0) {
/* Change the node type back to normal */ /* Change the node type back to normal */
if (!expanded) { if (!expanded) {
expanded = 1; expanded = 1;
set_nodeType(n,Getattr(n,"templatetype")); set_nodeType(n,Getattr(n,k_templatetype));
ret = cparse_template_expand(n,tname, rname, templateargs, patchlist,typelist, cpatchlist); ret = cparse_template_expand(n,tname, rname, templateargs, patchlist,typelist, cpatchlist);
expanded = 0; expanded = 0;
return ret; return ret;
@ -59,40 +133,39 @@ cparse_template_expand(Node *n, String *tname, String *rname, String *templatear
/* Called when template appears inside another template */ /* Called when template appears inside another template */
/* Member templates */ /* Member templates */
set_nodeType(n,Getattr(n,"templatetype")); set_nodeType(n,Getattr(n,k_templatetype));
ret = cparse_template_expand(n,tname, rname, templateargs, patchlist,typelist, cpatchlist); ret = cparse_template_expand(n,tname, rname, templateargs, patchlist,typelist, cpatchlist);
set_nodeType(n,"template"); set_nodeType(n,k_template);
return ret; return ret;
} }
} else if (Strcmp(nodeType(n),"cdecl") == 0) { } else if (Strcmp(nodeType,k_cdecl) == 0) {
/* A simple C declaration */ /* A simple C declaration */
SwigType *t, *v, *d; SwigType *t, *v, *d;
String *code; String *code;
t = Getattr(n,"type"); t = Getattr(n,k_type);
v = Getattr(n,"value"); v = Getattr(n,k_value);
d = Getattr(n,"decl"); d = Getattr(n,k_decl);
code = Getattr(n,"code"); code = Getattr(n,k_code);
Append(typelist,t); Append(typelist,t);
Append(typelist,d); Append(typelist,d);
Append(patchlist,v); Append(patchlist,v);
Append(cpatchlist,code); Append(cpatchlist,code);
if (Getattr(n,"conversion_operator")) { if (Getattr(n,k_conversionoperator)) {
Append(cpatchlist, Getattr(n,"name")); Append(cpatchlist, Getattr(n,k_name));
if (Getattr(n,"sym:name")) { if (Getattr(n,k_symname)) {
Append(cpatchlist, Getattr(n,"sym:name")); Append(cpatchlist, Getattr(n,k_symname));
} }
} }
add_parms(Getattr(n,"parms"), cpatchlist, typelist); add_parms(Getattr(n,k_parms), cpatchlist, typelist);
add_parms(Getattr(n,"throws"), cpatchlist, typelist); add_parms(Getattr(n,k_throws), cpatchlist, typelist);
} else if (Strcmp(nodeType(n),"class") == 0) { } else if (Strcmp(nodeType,k_class) == 0) {
/* Patch base classes */ /* Patch base classes */
{ {
char *baselists[] = {"baselist","protectedbaselist","privatebaselist"};
int b = 0; int b = 0;
for (b = 0; b < 3; ++b) { for (b = 0; b < 3; ++b) {
List *bases = Getattr(n,baselists[b]); List *bases = Getattr(n,baselists[b]);
@ -114,16 +187,16 @@ cparse_template_expand(Node *n, String *tname, String *rname, String *templatear
cn = nextSibling(cn); cn = nextSibling(cn);
} }
} }
} else if (Strcmp(nodeType(n),"constructor") == 0) { } else if (Strcmp(nodeType,k_constructor) == 0) {
String *name = Getattr(n,"name"); String *name = Getattr(n,k_name);
if (!(Getattr(n,"templatetype"))) { if (!(Getattr(n,k_templatetype))) {
String *symname; String *symname;
String *stripped_name = SwigType_templateprefix(name); String *stripped_name = SwigType_templateprefix(name);
if (Strstr(tname,stripped_name)) { if (Strstr(tname,stripped_name)) {
Replaceid(name,stripped_name,tname); Replaceid(name,stripped_name,tname);
} }
Delete(stripped_name); Delete(stripped_name);
symname = Getattr(n,"sym:name"); symname = Getattr(n,k_symname);
if (symname) { if (symname) {
stripped_name = SwigType_templateprefix(symname); stripped_name = SwigType_templateprefix(symname);
if (Strstr(tname,stripped_name)) { if (Strstr(tname,stripped_name)) {
@ -132,61 +205,61 @@ cparse_template_expand(Node *n, String *tname, String *rname, String *templatear
Delete(stripped_name); Delete(stripped_name);
} }
if (Strstr(name,"<")) { if (Strstr(name,"<")) {
Append(patchlist,Getattr(n,"name")); Append(patchlist,Getattr(n,k_name));
} else { } else {
Append(name,templateargs); Append(name,templateargs);
} }
name = Getattr(n,"sym:name"); name = Getattr(n,k_symname);
if (name && (Strstr(name,"<"))) { if (name && (Strstr(name,"<"))) {
Clear(name); Clear(name);
Append(name,rname); Append(name,rname);
} else { } else {
Replace(name,tname,rname, DOH_REPLACE_ANY); Replace(name,tname,rname, DOH_REPLACE_ANY);
} }
Setattr(n,"sym:name",name); Setattr(n,k_symname,name);
} }
Append(cpatchlist,Getattr(n,"code")); Append(cpatchlist,Getattr(n,k_code));
Append(typelist, Getattr(n,"decl")); Append(typelist, Getattr(n,k_decl));
add_parms(Getattr(n,"parms"), cpatchlist, typelist); add_parms(Getattr(n,k_parms), cpatchlist, typelist);
add_parms(Getattr(n,"throws"), cpatchlist, typelist); add_parms(Getattr(n,k_throws), cpatchlist, typelist);
} else if (Strcmp(nodeType(n),"destructor") == 0) { } else if (Strcmp(nodeType,k_destructor) == 0) {
String *name = Getattr(n,"name"); String *name = Getattr(n,k_name);
if (Strstr(name,"<")) { if (Strstr(name,"<")) {
Append(patchlist,Getattr(n,"name")); Append(patchlist,Getattr(n,k_name));
} else { } else {
Append(name,templateargs); Append(name,templateargs);
} }
name = Getattr(n,"sym:name"); name = Getattr(n,k_symname);
if (name && Strstr(name,"<")) { if (name && Strstr(name,"<")) {
String *sn = Copy(tname); String *sn = Copy(tname);
Setattr(n,"sym:name", sn); Setattr(n,k_symname, sn);
Delete(sn); Delete(sn);
} else { } else {
Replace(name,tname,rname, DOH_REPLACE_ANY); Replace(name,tname,rname, DOH_REPLACE_ANY);
} }
Setattr(n,"sym:name",name); Setattr(n,k_symname,name);
Append(cpatchlist,Getattr(n,"code")); Append(cpatchlist,Getattr(n,k_code));
} else if (Strcmp(nodeType(n),"using") == 0) { } else if (Strcmp(nodeType,k_using) == 0) {
String *uname = Getattr(n,"uname"); String *uname = Getattr(n,k_uname);
if (uname) { if (uname) {
if (Strstr(uname,"<")) { if (Strstr(uname,"<")) {
Append(patchlist, uname); Append(patchlist, uname);
} }
} }
if (Getattr(n,"namespace")) { if (Getattr(n,k_namespace)) {
/* Namespace link. This is nasty. Is other namespace defined? */ /* Namespace link. This is nasty. Is other namespace defined? */
} }
} else { } else {
/* Look for obvious parameters */ /* Look for obvious parameters */
Node *cn; Node *cn;
Append(cpatchlist,Getattr(n,"code")); Append(cpatchlist,Getattr(n,k_code));
Append(typelist, Getattr(n,"type")); Append(typelist, Getattr(n,k_type));
Append(typelist, Getattr(n,"decl")); Append(typelist, Getattr(n,k_decl));
add_parms(Getattr(n,"parms"), cpatchlist, typelist); add_parms(Getattr(n,k_parms), cpatchlist, typelist);
add_parms(Getattr(n,"kwargs"), cpatchlist, typelist); add_parms(Getattr(n,k_kwargs), cpatchlist, typelist);
add_parms(Getattr(n,"pattern"), cpatchlist, typelist); add_parms(Getattr(n,k_pattern), cpatchlist, typelist);
add_parms(Getattr(n,"throws"), cpatchlist, typelist); add_parms(Getattr(n,k_throws), cpatchlist, typelist);
cn = firstChild(n); cn = firstChild(n);
while (cn) { while (cn) {
cparse_template_expand(cn,tname, rname, templateargs, patchlist, typelist, cpatchlist); cparse_template_expand(cn,tname, rname, templateargs, patchlist, typelist, cpatchlist);
@ -235,25 +308,25 @@ Swig_cparse_template_expand(Node *n, String *rname, ParmList *tparms, Symtab *ts
Delete(tmp); Delete(tmp);
} }
tname = Copy(Getattr(n,"name")); tname = Copy(Getattr(n,k_name));
tbase = Swig_scopename_last(tname); tbase = Swig_scopename_last(tname);
/* Look for partial specialization matching */ /* Look for partial specialization matching */
if (Getattr(n,"partialargs")) { if (Getattr(n,k_partialargs)) {
Parm *p, *tp; Parm *p, *tp;
ParmList *ptargs = SwigType_function_parms(Getattr(n,"partialargs")); ParmList *ptargs = SwigType_function_parms(Getattr(n,k_partialargs));
p = ptargs; p = ptargs;
tp = tparms; tp = tparms;
while (p && tp) { while (p && tp) {
SwigType *ptype; SwigType *ptype;
SwigType *tptype; SwigType *tptype;
SwigType *partial_type; SwigType *partial_type;
ptype = Getattr(p,"type"); ptype = Getattr(p,k_type);
tptype = Getattr(tp,"type"); tptype = Getattr(tp,k_type);
if (ptype && tptype) { if (ptype && tptype) {
partial_type = partial_arg(tptype,ptype); partial_type = partial_arg(tptype,ptype);
/* Printf(stdout,"partial '%s' '%s' ---> '%s'\n", tptype, ptype, partial_type); */ /* Printf(stdout,"partial '%s' '%s' ---> '%s'\n", tptype, ptype, partial_type); */
Setattr(tp,"type",partial_type); Setattr(tp,k_type,partial_type);
Delete(partial_type); Delete(partial_type);
} }
p = nextSibling(p); p = nextSibling(p);
@ -266,7 +339,7 @@ Swig_cparse_template_expand(Node *n, String *rname, ParmList *tparms, Symtab *ts
if (0) { if (0) {
Parm *p = tparms; Parm *p = tparms;
while (p) { while (p) {
Printf(stdout,"tparm: '%s' '%s' '%s'\n", Getattr(p,"name"), Getattr(p,"type"), Getattr(p,"value")); Printf(stdout,"tparm: '%s' '%s' '%s'\n", Getattr(p,k_name), Getattr(p,k_type), Getattr(p,k_value));
p = nextSibling(p); p = nextSibling(p);
} }
} }
@ -278,7 +351,7 @@ Swig_cparse_template_expand(Node *n, String *rname, ParmList *tparms, Symtab *ts
/* Set the name */ /* Set the name */
{ {
String *name = Getattr(n,"name"); String *name = Getattr(n,k_name);
if (name) { if (name) {
Append(name,templateargs); Append(name,templateargs);
} }
@ -287,23 +360,23 @@ Swig_cparse_template_expand(Node *n, String *rname, ParmList *tparms, Symtab *ts
/* Patch all of the types */ /* Patch all of the types */
{ {
Parm *tp = Getattr(n,"templateparms"); Parm *tp = Getattr(n,k_templateparms);
Parm *p = tparms; Parm *p = tparms;
/* Printf(stdout,"%s\n", ParmList_str_defaultargs(tp)); */ /* Printf(stdout,"%s\n", ParmList_str_defaultargs(tp)); */
if (tp) { if (tp) {
Symtab *tsdecl = Getattr(n,"sym:symtab"); Symtab *tsdecl = Getattr(n,k_symsymtab);
while (p && tp) { while (p && tp) {
String *name, *value, *valuestr, *tydef, *tmp, *tmpr; String *name, *value, *valuestr, *tydef, *tmp, *tmpr;
int sz, i; int sz, i;
String *dvalue = 0; String *dvalue = 0;
name = Getattr(tp,"name"); name = Getattr(tp,k_name);
value = Getattr(p,"value"); value = Getattr(p,k_value);
tydef = Getattr(p,"typedef"); tydef = Getattr(p,k_typedef);
if (name) { if (name) {
if (!value) value = Getattr(p,"type"); if (!value) value = Getattr(p,k_type);
dvalue = Swig_symbol_type_qualify(value,tsdecl); dvalue = Swig_symbol_type_qualify(value,tsdecl);
if (SwigType_istemplate(dvalue)) { if (SwigType_istemplate(dvalue)) {
String *ty = Swig_symbol_template_deftype(dvalue, tscope); String *ty = Swig_symbol_template_deftype(dvalue, tscope);
@ -317,7 +390,7 @@ Swig_cparse_template_expand(Node *n, String *rname, ParmList *tparms, Symtab *ts
{ {
Parm *rp = nextSibling(p); Parm *rp = nextSibling(p);
while (rp) { while (rp) {
String *rvalue = Getattr(rp,"value"); String *rvalue = Getattr(rp,k_value);
if (rvalue) { if (rvalue) {
Replace(rvalue,name,dvalue, DOH_REPLACE_ID); Replace(rvalue,name,dvalue, DOH_REPLACE_ID);
} }
@ -374,7 +447,7 @@ Swig_cparse_template_expand(Node *n, String *rname, ParmList *tparms, Symtab *ts
/* Patch bases */ /* Patch bases */
{ {
List *bases = Getattr(n,"baselist"); List *bases = Getattr(n,k_baselist);
if (bases) { if (bases) {
Iterator b; Iterator b;
for (b = First(bases); b.item; b = Next(b)) { for (b = First(bases); b.item; b = Next(b)) {
@ -391,7 +464,7 @@ Swig_cparse_template_expand(Node *n, String *rname, ParmList *tparms, Symtab *ts
Delete(tbase); Delete(tbase);
Delete(templateargs); Delete(templateargs);
/* set_nodeType(n,"template");*/ /* set_nodeType(n,k_template);*/
return 0; return 0;
} }
@ -419,9 +492,9 @@ template_locate(String *name, Parm *tparms, Symtab *tscope) {
/* Add default values from generic template */ /* Add default values from generic template */
if (templ) { if (templ) {
Symtab *tsdecl = Getattr(templ,"sym:symtab"); Symtab *tsdecl = Getattr(templ,k_symsymtab);
targs = Getattr(templ,"templateparms"); targs = Getattr(templ,k_templateparms);
Swig_symbol_template_defargs(parms, targs, tscope, tsdecl); Swig_symbol_template_defargs(parms, targs, tscope, tsdecl);
} }
@ -429,10 +502,10 @@ template_locate(String *name, Parm *tparms, Symtab *tscope) {
/* reduce the typedef */ /* reduce the typedef */
p = parms; p = parms;
while (p) { while (p) {
SwigType *ty = Getattr(p,"type"); SwigType *ty = Getattr(p,k_type);
if (ty) { if (ty) {
SwigType *nt = Swig_symbol_type_qualify(ty,tscope); SwigType *nt = Swig_symbol_type_qualify(ty,tscope);
Setattr(p,"type",nt); Setattr(p,k_type,nt);
Delete(nt); Delete(nt);
} }
p = nextSibling(p); p = nextSibling(p);
@ -447,33 +520,34 @@ template_locate(String *name, Parm *tparms, Symtab *tscope) {
/* Search for an exact specialization. /* Search for an exact specialization.
Example: template<> class name<int> { ... } */ Example: template<> class name<int> { ... } */
{ {
if (template_debug) { if (template_debug) {
Printf(stdout," searching: '%s' (exact specialization)\n", tname); Printf(stdout," searching: '%s' (exact specialization)\n", tname);
} }
n = Swig_symbol_clookup_local(tname,0); n = Swig_symbol_clookup_local(tname,0);
if (!n) { if (!n) {
SwigType *rname = Swig_symbol_typedef_reduce(tname,tscope); SwigType *rname = Swig_symbol_typedef_reduce(tname,tscope);
if (Strcmp(rname,tname)) { if (Strcmp(rname,tname)) {
if (template_debug) { if (template_debug) {
Printf(stdout," searching: '%s' (exact specialization)\n", rname); Printf(stdout," searching: '%s' (exact specialization)\n", rname);
}
n = Swig_symbol_clookup_local(rname,0);
} }
Delete(rname); n = Swig_symbol_clookup_local(rname,0);
} }
if (n) { Delete(rname);
Node *tn; }
if (Strcmp(nodeType(n),"template") == 0) goto success; if (n) {
tn = Getattr(n,"template"); Node *tn;
if (tn) { String *nodeType = Getattr(n,k_nodetype);
n = tn; if (Strcmp(nodeType,k_template) == 0) goto success;
goto success; /* Previously wrapped by a template return that */ tn = Getattr(n,k_template);
} if (tn) {
Swig_error(cparse_file, cparse_line, "'%s' is not defined as a template. (%s)\n", name, nodeType(n)); n = tn;
Delete(tname); goto success; /* Previously wrapped by a template return that */
Delete(parms);
return 0; /* Found a match, but it's not a template of any kind. */
} }
Swig_error(cparse_file, cparse_line, "'%s' is not defined as a template. (%s)\n", name, Getattr(n,k_nodetype));
Delete(tname);
Delete(parms);
return 0; /* Found a match, but it's not a template of any kind. */
}
} }
/* Search for partial specialization. /* Search for partial specialization.
@ -485,25 +559,25 @@ template_locate(String *name, Parm *tparms, Symtab *tscope) {
p = parms; p = parms;
while (p) { while (p) {
String *t; String *t;
t = Getattr(p,"type"); t = Getattr(p,k_type);
if (!t) t = Getattr(p,"value"); if (!t) t = Getattr(p,k_value);
if (t) { if (t) {
String *ty = Swig_symbol_typedef_reduce(t,tscope); String *ty = Swig_symbol_typedef_reduce(t,tscope);
String *tb = SwigType_base(ty); String *tb = SwigType_base(ty);
String *td = SwigType_default(ty); String *td = SwigType_default(ty);
Replaceid(td,"enum SWIGTYPE",tb); Replaceid(td,"enum SWIGTYPE",tb);
Replaceid(td,"SWIGTYPE",tb); Replaceid(td,"SWIGTYPE",tb);
Printf(rname,"%s",td); Append(rname,td);
Delete(tb); Delete(tb);
Delete(ty); Delete(ty);
Delete(td); Delete(td);
} }
p = nextSibling(p); p = nextSibling(p);
if (p) { if (p) {
Printf(rname,","); Append(rname,",");
} }
} }
Printf(rname,")>"); Append(rname,")>");
mpartials = NewList(); mpartials = NewList();
if (templ) { if (templ) {
@ -515,7 +589,7 @@ template_locate(String *name, Parm *tparms, Symtab *tscope) {
String *ss; String *ss;
Iterator pi; Iterator pi;
partials = Getattr(templ,"partials"); partials = Getattr(templ,k_partials);
if (partials) { if (partials) {
for (pi = First(partials); pi.item; pi = Next(pi)) { for (pi = First(partials); pi.item; pi = Next(pi)) {
ss = Copy(pi.item); ss = Copy(pi.item);
@ -524,8 +598,8 @@ template_locate(String *name, Parm *tparms, Symtab *tscope) {
while (p) { while (p) {
String *t,*tn; String *t,*tn;
sprintf(tmp,"$%d",i); sprintf(tmp,"$%d",i);
t = Getattr(p,"type"); t = Getattr(p,k_type);
if (!t) t = Getattr(p,"value"); if (!t) t = Getattr(p,k_value);
if (t) { if (t) {
String *ty = Swig_symbol_typedef_reduce(t,tscope); String *ty = Swig_symbol_typedef_reduce(t,tscope);
tn = SwigType_base(ty); tn = SwigType_base(ty);
@ -561,7 +635,7 @@ template_locate(String *name, Parm *tparms, Symtab *tscope) {
SwigType_namestr(tname)); SwigType_namestr(tname));
Swig_warning(WARN_PARSE_TEMPLATE_AMBIG,Getfile(n),Getline(n), Swig_warning(WARN_PARSE_TEMPLATE_AMBIG,Getfile(n),Getline(n),
" instantiation '%s' is used.\n", " instantiation '%s' is used.\n",
SwigType_namestr(Getattr(n,"name"))); SwigType_namestr(Getattr(n,k_name)));
} }
} }
} }
@ -570,10 +644,13 @@ template_locate(String *name, Parm *tparms, Symtab *tscope) {
n = templ; n = templ;
} }
if (!n) { if (!n) {
Swig_error(cparse_file, cparse_line, "Template '%s' undefined.\n", name); Swig_error(cparse_file, cparse_line, "Template '%s' undefined.\n", name);
} else if (n && (Strcmp(nodeType(n),"template") != 0)) { } else if (n) {
Swig_error(cparse_file, cparse_line, "'%s' is not defined as a template. (%s)\n", name, nodeType(n)); String *nodeType = Getattr(n,k_nodetype);
if (Strcmp(nodeType,k_template) != 0) {
Swig_error(cparse_file, cparse_line, "'%s' is not defined as a template. (%s)\n", name, nodeType);
n = 0; n = 0;
}
} }
success: success:
Delete(tname); Delete(tname);
@ -599,13 +676,13 @@ template_locate(String *name, Parm *tparms, Symtab *tscope) {
Node * Node *
Swig_cparse_template_locate(String *name, Parm *tparms, Symtab *tscope) { Swig_cparse_template_locate(String *name, Parm *tparms, Symtab *tscope) {
Node *n = 0; Node *n = template_locate(name, tparms, tscope); /* this function does what we want for templated classes */
n = template_locate(name, tparms, tscope); /* this function does what we want for templated classes */ String *nodeType = Getattr(n,k_nodetype);
if (n) { if (n) {
int isclass = 0; int isclass = 0;
assert(Strcmp(nodeType(n),"template") == 0); assert(Strcmp(nodeType,k_template) == 0);
isclass = (Strcmp(Getattr(n,"templatetype"),"class") == 0); isclass = (Strcmp(Getattr(n,k_templatetype),k_class) == 0);
if (!isclass) { if (!isclass) {
/* If not a templated class we must have a templated function. /* If not a templated class we must have a templated function.
The template found is not necessarily the one we want when dealing with templated The template found is not necessarily the one we want when dealing with templated
@ -620,13 +697,13 @@ Swig_cparse_template_locate(String *name, Parm *tparms, Symtab *tscope) {
n = Swig_symbol_clookup_local(name,0); n = Swig_symbol_clookup_local(name,0);
while (n) { while (n) {
Parm *tparmsfound = Getattr(n,"templateparms"); Parm *tparmsfound = Getattr(n,k_templateparms);
if (ParmList_len(tparms) == ParmList_len(tparmsfound)) { if (ParmList_len(tparms) == ParmList_len(tparmsfound)) {
/* successful match */ /* successful match */
break; break;
} }
/* repeat until we find a match with correct number of templated parameters */ /* repeat until we find a match with correct number of templated parameters */
n = Getattr(n,"sym:nextSibling"); n = Getattr(n,k_symnextSibling);
} }
if (!n) { if (!n) {