[Swig-cvs] SWIG/Source/Modules lang.cxx,1.132,1.133 python.cxx,1.169,1.170

[Marcelo M. <mar...@us...>]

Update of /cvsroot/swig/SWIG/Source/Modules
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13432/Source/Modules

Modified Files:
	lang.cxx python.cxx 
Log Message:
flag the memberget/memberset methods and use it to deactivate kwargs, reported by amaury

Index: python.cxx
===================================================================
RCS file: /cvsroot/swig/SWIG/Source/Modules/python.cxx,v
retrieving revision 1.169
retrieving revision 1.170
diff -C2 -d -r1.169 -r1.170
*** python.cxx	5 Jan 2006 11:09:48 -0000	1.169
--- python.cxx	6 Jan 2006 16:55:57 -0000	1.170
***************
*** 1270,1274 ****
  
    int check_kwargs(Node *n) {
!     return (use_kw || GetFlag(n,"feature:kwargs"));
    }
  
--- 1270,1276 ----
  
    int check_kwargs(Node *n) {
!     return (use_kw || GetFlag(n,"feature:kwargs")) 
!       && !GetFlag(n,"memberset") && !GetFlag(n,"memberget") 
!       && !checkAttribute(n,"nodeType","destructor");
    }
  

Index: lang.cxx
===================================================================
RCS file: /cvsroot/swig/SWIG/Source/Modules/lang.cxx,v
retrieving revision 1.132
retrieving revision 1.133
diff -C2 -d -r1.132 -r1.133
*** lang.cxx	5 Jan 2006 22:19:37 -0000	1.132
--- lang.cxx	6 Jan 2006 16:55:56 -0000	1.133
***************
*** 1271,1274 ****
--- 1271,1275 ----
  
        Swig_MembersetToFunction(n,ClassType, flags);
+       Setattr(n,"memberset", "1");
        if (!Extend) {
  	/* Check for a member in typemap here */
***************
*** 1321,1324 ****
--- 1322,1326 ----
        Swig_MembergetToFunction(n,ClassType, flags);
        Setattr(n,"sym:name",  mrename_get);
+       Setattr(n,"memberget", "1");
        functionWrapper(n);
      }