From 985201ddec03445f0142736f337fa0f9068b3db6 Mon Sep 17 00:00:00 2001
From: Marcelo Matus <mmatus@acms.arizona.edu>
Date: Wed, 11 Jan 2006 01:02:57 +0000
Subject: [PATCH] fix problem introduced by notmatch, extra not

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@8367 626c5289-ae23-0410-ae9c-e8d60b6d4f22
---
 SWIG/Examples/test-suite/rename_camel.i | 11 +++++++++++
 SWIG/Source/Swig/naming.c               | 15 +++++++++++++--
 2 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/SWIG/Examples/test-suite/rename_camel.i b/SWIG/Examples/test-suite/rename_camel.i
index bdb848ef3..11edba781 100644
--- a/SWIG/Examples/test-suite/rename_camel.i
+++ b/SWIG/Examples/test-suite/rename_camel.i
@@ -1,5 +1,14 @@
 %module rename_camel
 
+%rename("%(utitle)s",match="cdecl") ""; 
+
+%inline {
+  struct GeometryFactory 
+  {
+    void createPointFromInternalCoord(int);
+  };  
+}
+
 
 %define SedCmd "%(command:sed -e 's/\([a-z]\)/\U\\1/' -e 's/\(_\)\([a-z]\)/\U\\2/g' <<<)s" %enddef
 
@@ -40,3 +49,5 @@
   int foo(int);
   
 }
+
+
diff --git a/SWIG/Source/Swig/naming.c b/SWIG/Source/Swig/naming.c
index d2eb4794c..414d30540 100644
--- a/SWIG/Source/Swig/naming.c
+++ b/SWIG/Source/Swig/naming.c
@@ -20,7 +20,9 @@ char cvsroot_naming_c[] = "$Header$";
 
 static Hash *naming_hash = 0;
 
-/* #define SWIG_DEBUG  */
+#if 0
+#define SWIG_DEBUG 
+#endif
 
 /* -----------------------------------------------------------------------------
  * Swig_name_register()
@@ -1079,6 +1081,9 @@ static DOH *Swig_get_lattr(Node *n, List *lattr)
 int Swig_name_match_nameobj(Hash *rn, Node *n) {
   int match = 1;
   List *matchlist = HashGetAttr(rn,k_matchlist);
+#ifdef SWIG_DEBUG 
+  Printf(stderr,"Swig_name_match_nameobj: %s\n",Getattr(n,"name"));
+#endif
   if (matchlist) {
     int ilen = Len(matchlist);
     int i;
@@ -1091,10 +1096,16 @@ int Swig_name_match_nameobj(Hash *rn, Node *n) {
       if (nval) {
 	String *kwval = Getattr(kw,k_value);
 	match = Equal(nval, kwval);
+#ifdef SWIG_DEBUG 
+	Printf(stderr,"val %s %s %d %d \n",nval, kwval,match, notmatch);
+#endif
       }
-      if (!notmatch) match = !match;
+      if (notmatch) match = !match;
     }
   }
+#ifdef SWIG_DEBUG 
+  Printf(stderr,"Swig_name_match_nameobj: %d\n",match);
+#endif
   return match;
 }