[Swig-cvs] SF.net SVN: swig: [10519] trunk

[<bh...@us...>]

Revision: 10519
          http://swig.svn.sourceforge.net/swig/?rev=10519&view=rev
Author:   bhy
Date:     2008-06-07 06:40:51 -0700 (Sat, 07 Jun 2008)

Log Message:
-----------
fixed keyword_rename.ctest tese case, caused by a mistake in Swig/naming.c

Modified Paths:
--------------
    trunk/CHANGES.current
    trunk/Examples/test-suite/keyword_rename.i
    trunk/Source/Swig/naming.c

Modified: trunk/CHANGES.current
===================================================================
--- trunk/CHANGES.current	2008-06-07 11:20:07 UTC (rev 10518)
+++ trunk/CHANGES.current	2008-06-07 13:40:51 UTC (rev 10519)
@@ -1,6 +1,10 @@
 Version 1.3.36 (in progress)
 =============================
 
+06/07/2008: bhy
+            Added test case keyword_rename, then made the keyword renaming works properly
+            by fixing Swig_name_make() for a incomplete condition checking.
+
 06/02/2008: wsfulton
             [Java, C#] Fix enum wrappers when using -noproxy.
 

Modified: trunk/Examples/test-suite/keyword_rename.i
===================================================================
--- trunk/Examples/test-suite/keyword_rename.i	2008-06-07 11:20:07 UTC (rev 10518)
+++ trunk/Examples/test-suite/keyword_rename.i	2008-06-07 13:40:51 UTC (rev 10519)
@@ -3,7 +3,7 @@
  */
 
 %module keyword_rename
-
+%warnfilter(SWIGWARN_PARSE_KEYWORD);
 %inline %{
 
 #define KW(x, y) int x (int y) { return y;} 

Modified: trunk/Source/Swig/naming.c
===================================================================
--- trunk/Source/Swig/naming.c	2008-06-07 11:20:07 UTC (rev 10518)
+++ trunk/Source/Swig/naming.c	2008-06-07 13:40:51 UTC (rev 10519)
@@ -1477,7 +1477,7 @@
   }
 
 
-  if (rename_hash || rename_list) {
+  if (rename_hash || rename_list || namewarn_hash || namewarn_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);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.