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

fixes for %templates/%rename/%features + templates

Browse source 
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk/SWIG@8720 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
Marcelo Matus 2006-02-05 20:25:43 +00:00
commit 01893da18e
6 changed files with 144 additions and 72 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Source/CParse/parser.y
View file

@ -237,7 +237,8 @@ static String *make_name(Node *n, String *name,SwigType *decl) {
int destructor = name && (*(Char(name)) == '~');
if (yyrename) {
String *s = (yyrename);
String *s = NewString(yyrename);
Delete(yyrename);
yyrename = 0;
if (destructor && (*(Char(s)) != '~')) {
Insert(s,0,"~");
@ -539,11 +540,14 @@ static void add_symbols_copy(Node *n) {
if ((add_oldname) || (Getattr(n,"sym:needs_symtab"))) {
if (add_oldname) {
DohIncref(add_oldname);
/* If already renamed, we used that name */
/* Disable this, it prevents %rename to work with templates */
/* If already renamed, we used that name */
/*
if (Strcmp(add_oldname, Getattr(n,k_name)) != 0) {
Delete(yyrename);
yyrename = Copy(add_oldname);
}
*/
}
Delattr(n,"sym:needs_symtab");
Delattr(n,k_symname);
@ -587,12 +591,12 @@ static void add_symbols_copy(Node *n) {
}
if (add_oldname) {
Delete(add_oldname);
add_oldname = 0;
}
if (strcmp(cnodeType,"class") == 0) {
inclass = 0;
current_class = 0;
}
add_oldname = 0;
} else {
if (strcmp(cnodeType,"extend") == 0) {
emode = cplus_mode;