[pygccxml-commit] SF.net SVN: pygccxml: [621] pyplusplus_dev/pyplusplus/code_creators/ calldef_transformed.py

[<mb...@us...>]

Revision: 621
          http://svn.sourceforge.net/pygccxml/?rev=621&view=rev
Author:   mbaas
Date:     2006-10-04 06:01:57 -0700 (Wed, 04 Oct 2006)

Log Message:
-----------
The wrapper function name now contains the class name if the wrapper is a free function (this will prevent name clashes).

Modified Paths:
--------------
    pyplusplus_dev/pyplusplus/code_creators/calldef_transformed.py

Modified: pyplusplus_dev/pyplusplus/code_creators/calldef_transformed.py
===================================================================
--- pyplusplus_dev/pyplusplus/code_creators/calldef_transformed.py	2006-10-04 12:51:37 UTC (rev 620)
+++ pyplusplus_dev/pyplusplus/code_creators/calldef_transformed.py	2006-10-04 13:01:57 UTC (rev 621)
@@ -89,7 +89,21 @@
                 return_type=rettype
                 , arguments_types=map( lambda arg: arg.type, self.declaration.arguments ) )
 
+    def wrapper_name(self):
+        """Return the name of the wrapper function.
+
+        This is just the local name without any scope information.
         
+        """
+        # A list with the individual components of the name
+        components = ["_py"]
+        # Is the wrapper placed outside a wrapper class?
+        if not isinstance(self.parent, class_declaration.class_wrapper_t):
+            # Incorporate the original class name into the name
+            components.append(self.declaration.parent.name)
+        components.append(self.declaration.alias)
+        return "_".join(components)
+                
     def full_name(self):
         """Return the full name of the wrapper function.
 
@@ -98,9 +112,9 @@
         @rtype: str
         """
         if isinstance(self.parent, class_declaration.class_wrapper_t):
-            return self.parent.full_name + '::_py_' + self.declaration.alias
+            return self.parent.full_name + '::' + self.wrapper_name()
         else:
-            return '_py_' + self.declaration.alias
+            return self.wrapper_name()
 
     def create_sig_id(self):
         """Create an ID string that identifies a signature.
@@ -119,7 +133,7 @@
         template = self._subst_manager.subst_wrapper(template)
 
         return template % {
-            'name' : "_py_"+name
+            'name' : self.wrapper_name()
             , 'throw' : self.throw_specifier_code()
         }
 


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