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

Merge pull request #123 from wkalinin/test2

Browse source 
fixed enums & enum values language symbol table namespace
fixed skipping of %templates in %extend if they are in the wrong scope
This commit is contained in:
Vladimir Kalinin 2013-12-26 00:33:28 -08:00
commit 3412cc2f64
4 changed files with 62 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Source/CParse/parser.y
View file

@ -2679,7 +2679,8 @@ template_directive: SWIGTEMPLATE LPAREN idstringopt RPAREN idcolonnt LESSTHAN va
Setattr(templnode,"sym:typename","1");
}
/* for now, nested %template is allowed only in the same scope as the template declaration */
if ($3 && !(currentOuterClass && (currentOuterClass != Getattr(nn, "nested:outer")))) {
if ($3 && !(nnisclass && ((currentOuterClass && (currentOuterClass != Getattr(nn, "nested:outer")))
||(extendmode && current_class && (current_class != Getattr(nn, "nested:outer")))))) {
/*
Comment this out for 1.3.28. We need to
re-enable it later but first we need to