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

avoid assert when finding a recursive scope inheritance, emit a warning in the worst case, reported by Nitro

Browse source 
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk/SWIG@8832 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
Marcelo Matus 2006-02-17 22:13:37 +00:00
commit cb80d44fa6
4 changed files with 24 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Source/CParse/parser.y
View file

@ -2679,6 +2679,8 @@ template_directive: SWIGTEMPLATE LPAREN idstringopt RPAREN idcolonnt LESSTHAN va
for (s = First(bases); s.item; s = Next(s)) {
Symtab *st = Getattr(s.item,k_symtab);
if (st) {
Setfile(st,Getfile(s.item));
Setline(st,Getline(s.item));
Swig_symbol_inherit(st);
}
}
@ -3183,6 +3185,8 @@ cpp_class_decl :
for (s = First(bases); s.item; s = Next(s)) {
Symtab *st = Getattr(s.item,k_symtab);
if (st) {
Setfile(st,Getfile(s.item));
Setline(st,Getline(s.item));
Swig_symbol_inherit(st);
}
}
@ -3784,10 +3788,14 @@ cpp_using_decl : USING idcolon SEMI {
}
if (n) {
if (Strcmp(nodeType(n),"namespace") == 0) {
Symtab *current = Swig_symbol_current();
Symtab *symtab = Getattr(n,k_symtab);
$$ = new_node("using");
Setattr($$,"node",n);
Setattr($$,k_namespace, $3);
Swig_symbol_inherit(Getattr(n,k_symtab));
if (current != symtab) {
Swig_symbol_inherit(symtab);
}
} else {
Swig_error(cparse_file, cparse_line, "'%s' is not a namespace.\n", $3);
$$ = 0;