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

normalize operation, first reduce, then qualify

Browse source 
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk/SWIG@8055 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
Marcelo Matus 2005-12-23 10:12:15 +00:00
commit 846b944917
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Source/CParse/templ.c
View file

@ -383,8 +383,8 @@ Swig_cparse_template_expand(Node *n, String *rname, ParmList *tparms, Symtab *ts
if (name) {
if (!value) value = Getattr(p,k_type);
qvalue = Swig_symbol_type_qualify(value,tsdecl);
dvalue = Swig_symbol_typedef_reduce(qvalue, tsdecl);
qvalue = Swig_symbol_typedef_reduce(value, tsdecl);
dvalue = Swig_symbol_type_qualify(qvalue,tsdecl);
if (SwigType_istemplate(dvalue)) {
String *ty = Swig_symbol_template_deftype(dvalue, tscope);
Delete(dvalue);

4
Source/Swig/symbol.c
View file

@ -1058,8 +1058,8 @@ Swig_symbol_clookup(String_or_char *name, Symtab *n) {
}
if (!s) {
if (SwigType_istemplate(name)) {
SwigType *qt = Swig_symbol_type_qualify(name,hsym);
SwigType *rt = Swig_symbol_template_reduce(qt, hsym);
SwigType *qt = Swig_symbol_template_reduce(name, hsym);
SwigType *rt = Swig_symbol_type_qualify(qt,hsym);
if (!Equal(rt,name)) {
s = Swig_symbol_clookup(rt, hsym);
}