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

fix typedef_reduce + namespace

Browse source 
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk/SWIG@6430 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
Marcelo Matus 2004-10-18 01:53:42 +00:00
commit 85905ac7a2
1 changed files with 22 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

24
Source/Swig/symbol.c
View file

@ -1325,7 +1325,23 @@ SwigType *Swig_symbol_typedef_reduce(SwigType *ty, Symtab *tab) {
if (Strcmp(storage,"typedef") == 0) { if (Strcmp(storage,"typedef") == 0) {
SwigType *decl; SwigType *decl;
SwigType *rt; SwigType *rt;
SwigType *qt;
Symtab *ntab;
SwigType *nt = Copy(Getattr(n,"type")); SwigType *nt = Copy(Getattr(n,"type"));
#if 0
/* Fix for case 'typedef struct Hello hello;' */
{
const char* dclass[3] = {"struct ", "union ", "class "};
int i;
for (i=0; i<3; i++) {
char * c = Char(nt);
if (strstr(c, dclass[i]) == c) {
Replace(nt,dclass[i],"", DOH_REPLACE_FIRST);
}
}
}
#endif
decl = Getattr(n,"decl"); decl = Getattr(n,"decl");
if (decl) { if (decl) {
SwigType_push(nt,decl); SwigType_push(nt,decl);
@ -1333,9 +1349,13 @@ SwigType *Swig_symbol_typedef_reduce(SwigType *ty, Symtab *tab) {
SwigType_push(nt,prefix); SwigType_push(nt,prefix);
Delete(base); Delete(base);
Delete(prefix); Delete(prefix);
rt = Swig_symbol_typedef_reduce(nt, Getattr(n,"sym:symtab")); ntab = Getattr(n,"sym:symtab");
rt = Swig_symbol_typedef_reduce(nt, ntab);
/* fix for 'namespace n1 { typedef n2::hello hello; }' */
qt = Swig_symbol_type_qualify(rt, ntab);
Delete(nt); Delete(nt);
return rt; Delete(rt);
return qt;
} }
} }
Delete(base); Delete(base);