From 3f9632722aa34fe4e9c9644333ee3ac131d0ada4 Mon Sep 17 00:00:00 2001 From: Marcelo Matus Date: Mon, 9 Jan 2006 17:06:19 +0000 Subject: [PATCH] fix rename, problem detected in guile which doesn't set any namewarn git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@8317 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- SWIG/Source/Swig/naming.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/SWIG/Source/Swig/naming.c b/SWIG/Source/Swig/naming.c index 6aefa137e..d2eb4794c 100644 --- a/SWIG/Source/Swig/naming.c +++ b/SWIG/Source/Swig/naming.c @@ -462,6 +462,9 @@ Swig_name_object_get(Hash *namehash, String *prefix, String *name, SwigType *dec ncdecl++; } */ +#ifdef SWIG_DEBUG + Printf(stdout,"Swig_name_object_get: '%s', '%s'\n", name, decl); +#endif /* Perform a class-based lookup (if class prefix supplied) */ if (prefix) { @@ -513,6 +516,11 @@ Swig_name_object_get(Hash *namehash, String *prefix, String *name, SwigType *dec rn = name_object_get(namehash, name, decl, ncdecl); } Delete(tname); + +#ifdef SWIG_DEBUG + Printf(stdout,"Swig_name_object_get: found %d\n", rn ? 1 : 0); +#endif + return rn; } @@ -1302,7 +1310,7 @@ Swig_name_make(Node *n, String *prefix, String *name, SwigType *decl, String *ol String *nname = 0; String *result = 0; Hash *wrn = 0; - if (namewarn_hash || namewarn_list) { + if (rename_hash || rename_list) { Hash *rn = Swig_name_object_get(Swig_name_rename_hash(), prefix, name, decl); if (!rn || !Swig_name_match_nameobj(rn,n)) { rn = Swig_name_nameobj_lget(Swig_name_rename_list(), n, prefix, name, decl); @@ -1353,6 +1361,10 @@ Swig_name_make(Node *n, String *prefix, String *name, SwigType *decl, String *ol if (result) Delete(result); result = oldname ? Copy(oldname): Copy(name); } +#ifdef SWIG_DEBUG + Printf(stdout,"Swig_name_make: '%s' '%s'\n", name, result); +#endif + return result; }