pygccxml-commit

[pygccxml-commit] SF.net SVN: pygccxml: [436] pyplusplus_dev/contrib/goodies/goodie_utils.py

[<rom...@us...>]

Revision: 436
Author:   roman_yakovenko
Date:     2006-08-22 22:13:51 -0700 (Tue, 22 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/pygccxml/?rev=436&view=rev

Log Message:
-----------
few comments on goodies

Modified Paths:
--------------
    pyplusplus_dev/contrib/goodies/goodie_utils.py
Modified: pyplusplus_dev/contrib/goodies/goodie_utils.py
===================================================================
--- pyplusplus_dev/contrib/goodies/goodie_utils.py	2006-08-22 21:57:20 UTC (rev 435)
+++ pyplusplus_dev/contrib/goodies/goodie_utils.py	2006-08-23 05:13:51 UTC (rev 436)
@@ -1,111 +1,118 @@
-# Copyright 2004 Roman Yakovenko.
-# Distributed under the Boost Software License, Version 1.0. (See
-# accompanying file LICENSE_1_0.txt or copy at
-# http://www.boost.org/LICENSE_1_0.txt)
-#
-# Authors: 
-#   Allen Bierbaum
-#
-import pygccxml.declarations as pd
-from pyplusplus.module_builder.call_policies import *
-import pygccxml.declarations.type_traits as tt
-import pygccxml.declarations.cpptypes as cpptypes
-import pyplusplus.code_creators as code_creators
-import pyplusplus.decl_wrappers as decl_wrappers
-
-
-def set_recursive_default(val):
-   pd.scopedef_t.RECURSIVE_DEFAULT = val
-
-def finalize(cls):
-   """ Attempt to finalize a class by not exposing virtual methods.
-       Still exposes in the case of pure virtuals otherwise the class
-       could not be instantiated.
-   """
-   members = cls.member_functions(allow_empty=True)
-   if members:
-      for m in members:
-         if m.virtuality == pd.VIRTUALITY_TYPES.VIRTUAL:
-            m.virtuality = pd.VIRTUALITY_TYPES.NOT_VIRTUAL
-   
-
-def add_member_function(cls, methodName, newMethod):
-   """ Add a member function to the class. """
-   cls.add_registration_code('def("%s",%s)'%(methodName, newMethod), True)   
-
-def wrap_method(cls, methodName, newMethod):
-   """ Wrap a class method with a new method. 
-       ex: c.wrapmethod(c,"doSomething","doSomethingWrapper")
-   """
-   cls[methodName].exclude()
-   add_member_function(cls, methodName, newMethod)
-   
-def add_method(moduleBuilder, methodName, method):
-   """  Add a method to the module builder. """
-   code_text = 'boost::python::def("%s",%s);'%(methodName, method)
-   moduleBuilder.code_creator.body.adopt_creator( code_creators.custom_text_t( code_text ), 0 )
-
-def is_const_ref(type):
-   """ Extra trait tester method to check if something is a const reference. """
-   is_const = tt.is_const(type) or (hasattr(type,'base') and tt.is_const(type.base))
-   is_ref = tt.is_reference(type) or (hasattr(type,'base') and tt.is_reference(type.base))   
-   return (is_ref and is_const)
-
-def exclude_protected(cls):
-   """ Exclude all protected declarations. """
-   cls.decls(pd.access_type_matcher_t('protected'),allow_empty=True).exclude()
-   
-def wrap_const_ref_params(cls):
-   """ Find all member functions of cls and if they take a const& to a class
-       that does not have a destructor, then create a thin wrapper for them.
-       This works around an issue with boost.python where it needs a destructor.
-   """
-   calldefs = cls.calldefs()
-   
-   if None == calldefs:
-      return
-
-   for c in calldefs:
-      # Skip constructors
-      if isinstance(c, pd.constructor_t):
-         continue
-      
-      # Find arguments that need replacing
-      args_to_replace = []   # List of indices to args to replace with wrapping
-      args = c.arguments
-      for i in range(len(args)):
-         arg = args[i]
-         if is_const_ref(arg.type):
-            naked_arg = tt.remove_cv(tt.remove_reference(arg.type))
-            if tt.is_class(naked_arg):
-               class_type = naked_arg.declaration
-               if not tt.has_public_destructor(class_type):
-                  print "Found indestructible const& arg: [%s]:[%s] "%(str(c), str(arg))
-                  args_to_replace.append(i)
-      
-      # Now replace arguments
-      if len(args_to_replace):
-         if isinstance(c, pd.operator_t) and c.symbol in ["<","==","!=","="]:
-            c.exclude()
-            continue
-            
-         new_args = copy.copy(args)   # Make new copy of args so we don't modify the existing method
-         for i in args_to_replace:
-            old_arg_type = args[i].type
-            if tt.is_reference(old_arg_type) and tt.is_const(old_arg_type.base):
-               new_args[i].type = cpptypes.reference_t(tt.remove_const(old_arg_type.base))
-            elif tt.is_const(old_arg):
-               new_args[i].type = tt.remove_const(old_arg_type)
-               
-         new_name = "%s_const_ref_wrapper"%c.name
-         args_str = [str(a) for a in new_args]
-         arg_names_str = [str(a.name) for a in new_args]
-         new_sig = "static %s %s(%s& self_arg, %s)"%(c.return_type,new_name,cls.name,",".join(args_str))         
-         new_method = """%s
-         { return self_arg.%s(%s); }
-         """%(new_sig,c.name,",".join(arg_names_str))
-         
-         # Add it all
-         c.exclude()
-         cls.add_wrapper_code(new_method)
-         cls.add_code('def("%s", &%s::%s);'%(c.name, cls.wrapper_alias,new_name))
+# Copyright 2004 Roman Yakovenko.
+# Distributed under the Boost Software License, Version 1.0. (See
+# accompanying file LICENSE_1_0.txt or copy at
+# http://www.boost.org/LICENSE_1_0.txt)
+#
+# Authors:
+#   Allen Bierbaum
+#
+import pygccxml.declarations as pd
+from pyplusplus.module_builder.call_policies import *
+import pygccxml.declarations.type_traits as tt
+import pygccxml.declarations.cpptypes as cpptypes
+import pyplusplus.code_creators as code_creators
+import pyplusplus.decl_wrappers as decl_wrappers
+
+
+def set_recursive_default(val):
+   pd.scopedef_t.RECURSIVE_DEFAULT = val
+
+#[Roman]The better way is to turn virtuality from virtual to non virtual
+def finalize(cls):
+   """ Attempt to finalize a class by not exposing virtual methods.
+       Still exposes in the case of pure virtuals otherwise the class
+       could not be instantiated.
+   """
+   members = cls.member_functions(allow_empty=True)
+   if members:
+      for m in members:
+         if m.virtuality == pd.VIRTUALITY_TYPES.VIRTUAL:
+            m.virtuality = pd.VIRTUALITY_TYPES.NOT_VIRTUAL
+
+
+def add_member_function(cls, methodName, newMethod):
+   """ Add a member function to the class. """
+   cls.add_registration_code('def("%s",%s)'%(methodName, newMethod), True)
+
+def wrap_method(cls, methodName, newMethod):
+   """ Wrap a class method with a new method.
+       ex: c.wrapmethod(c,"doSomething","doSomethingWrapper")
+   """
+   cls[methodName].exclude()
+   add_member_function(cls, methodName, newMethod)
+
+def add_method(moduleBuilder, methodName, method):
+   """  Add a method to the module builder. """
+   code_text = 'boost::python::def("%s",%s);'%(methodName, method)
+   moduleBuilder.code_creator.body.adopt_creator( code_creators.custom_text_t( code_text ), 0 )
+   #[Roman]moduleBuilder.add_registration_code( ... ), see relevant documentation
+
+
+def is_const_ref(type):
+   """ Extra trait tester method to check if something is a const reference. """
+   is_const = tt.is_const(type) or (hasattr(type,'base') and tt.is_const(type.base))
+   is_ref = tt.is_reference(type) or (hasattr(type,'base') and tt.is_reference(type.base))
+   return (is_ref and is_const)
+   #[Roman]If you create unit tests for this code, I will add it to type traits module
+
+def exclude_protected(cls):
+   """ Exclude all protected declarations. """
+   cls.decls(pd.access_type_matcher_t('protected'),allow_empty=True).exclude()
+
+def wrap_const_ref_params(cls):
+   """ Find all member functions of cls and if they take a const& to a class
+       that does not have a destructor, then create a thin wrapper for them.
+       This works around an issue with boost.python where it needs a destructor.
+   """
+   #[Roman] Obviously, this will only work, if the function does not need other
+   #wrapper, I think, this is a new use case for Matthias "arguments policies"
+   #functionality.
+   calldefs = cls.calldefs()
+
+   if None == calldefs:
+      return
+
+   for c in calldefs:
+      # Skip constructors
+      if isinstance(c, pd.constructor_t):
+         continue
+
+      # Find arguments that need replacing
+      args_to_replace = []   # List of indices to args to replace with wrapping
+      args = c.arguments
+      for i in range(len(args)):
+         arg = args[i]
+         if is_const_ref(arg.type):
+            naked_arg = tt.remove_cv(tt.remove_reference(arg.type))
+            if tt.is_class(naked_arg):
+               class_type = naked_arg.declaration
+               if not tt.has_public_destructor(class_type):
+                  print "Found indestructible const& arg: [%s]:[%s] "%(str(c), str(arg))
+                  args_to_replace.append(i)
+
+      # Now replace arguments
+      if len(args_to_replace):
+         if isinstance(c, pd.operator_t) and c.symbol in ["<","==","!=","="]:
+            c.exclude()
+            continue
+
+         new_args = copy.copy(args)   # Make new copy of args so we don't modify the existing method
+         for i in args_to_replace:
+            old_arg_type = args[i].type
+            if tt.is_reference(old_arg_type) and tt.is_const(old_arg_type.base):
+               new_args[i].type = cpptypes.reference_t(tt.remove_const(old_arg_type.base))
+            elif tt.is_const(old_arg):
+               new_args[i].type = tt.remove_const(old_arg_type)
+
+         new_name = "%s_const_ref_wrapper"%c.name
+         args_str = [str(a) for a in new_args]
+         arg_names_str = [str(a.name) for a in new_args]
+         new_sig = "static %s %s(%s& self_arg, %s)"%(c.return_type,new_name,cls.name,",".join(args_str))
+         new_method = """%s
+         { return self_arg.%s(%s); }
+         """%(new_sig,c.name,",".join(arg_names_str))
+
+         # Add it all
+         c.exclude()
+         cls.add_wrapper_code(new_method)
+         cls.add_code('def("%s", &%s::%s);'%(c.name, cls.wrapper_alias,new_name))


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

[pygccxml-commit] SF.net SVN: pygccxml: [444] pyplusplus_dev/contrib/goodies/goodie_utils.py

[<rom...@us...>]

Revision: 444
Author:   roman_yakovenko
Date:     2006-08-23 12:31:39 -0700 (Wed, 23 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/pygccxml/?rev=444&view=rev

Log Message:
-----------
improving implementation of finalize method
adding few comments here and there

Modified Paths:
--------------
    pyplusplus_dev/contrib/goodies/goodie_utils.py
Modified: pyplusplus_dev/contrib/goodies/goodie_utils.py
===================================================================
--- pyplusplus_dev/contrib/goodies/goodie_utils.py	2006-08-23 19:29:16 UTC (rev 443)
+++ pyplusplus_dev/contrib/goodies/goodie_utils.py	2006-08-23 19:31:39 UTC (rev 444)
@@ -15,104 +15,110 @@
 
 
 def set_recursive_default(val):
-   pd.scopedef_t.RECURSIVE_DEFAULT = val
+    pd.scopedef_t.RECURSIVE_DEFAULT = val
 
 #[Roman]The better way is to turn virtuality from virtual to non virtual
 def finalize(cls):
-   """ Attempt to finalize a class by not exposing virtual methods.
-       Still exposes in the case of pure virtuals otherwise the class
-       could not be instantiated.
-   """
-   members = cls.member_functions(allow_empty=True)
-   if members:
-      for m in members:
-         if m.virtuality == pd.VIRTUALITY_TYPES.VIRTUAL:
-            m.virtuality = pd.VIRTUALITY_TYPES.NOT_VIRTUAL
+    """ Attempt to finalize a class by not exposing virtual methods.
+            Still exposes in the case of pure virtuals otherwise the class
+            could not be instantiated.
+    """
+    members = cls.decls( pd.virtuality_type_matcher( pd.VIRTUALITY_TYPES.VIRTUAL )
+                         , decl_type=pd.member_calldef_t
+                         , allow_empty=True)
+    members.set_virtuality( pd.VIRTUALITY_TYPES.NOT_VIRTUAL ) 
 
 
 def add_member_function(cls, methodName, newMethod):
-   """ Add a member function to the class. """
-   cls.add_registration_code('def("%s",%s)'%(methodName, newMethod), True)
+    """ Add a member function to the class. """
+    cls.add_registration_code('def("%s",%s)'%(methodName, newMethod), True)
 
 def wrap_method(cls, methodName, newMethod):
-   """ Wrap a class method with a new method.
-       ex: c.wrapmethod(c,"doSomething","doSomethingWrapper")
-   """
-   cls[methodName].exclude()
-   add_member_function(cls, methodName, newMethod)
+    """ Wrap a class method with a new method.
+            ex: c.wrapmethod(c,"doSomething","doSomethingWrapper")
+    """
+    cls[methodName].exclude()
+    add_member_function(cls, methodName, newMethod)
 
 def add_method(moduleBuilder, methodName, method):
-   """  Add a method to the module builder. """
-   code_text = 'boost::python::def("%s",%s);'%(methodName, method)
-   moduleBuilder.code_creator.body.adopt_creator( code_creators.custom_text_t( code_text ), 0 )
-   #[Roman]moduleBuilder.add_registration_code( ... ), see relevant documentation
+    """  Add a method to the module builder. """
+    code_text = 'boost::python::def("%s",%s);'%(methodName, method)
+    moduleBuilder.code_creator.body.adopt_creator( code_creators.custom_text_t( code_text ), 0 )
+    #[Roman]moduleBuilder.add_registration_code( ... ), see relevant documentation
+    #This will add have exactly same effect as a previous line, also you don't
+    #have to build code creator first
 
 
 def is_const_ref(type):
-   """ Extra trait tester method to check if something is a const reference. """
-   is_const = tt.is_const(type) or (hasattr(type,'base') and tt.is_const(type.base))
-   is_ref = tt.is_reference(type) or (hasattr(type,'base') and tt.is_reference(type.base))
-   return (is_ref and is_const)
-   #[Roman]If you create unit tests for this code, I will add it to type traits module
+    """ Extra trait tester method to check if something is a const reference. """
+    is_const = tt.is_const(type) or (hasattr(type,'base') and tt.is_const(type.base))
+    is_ref = tt.is_reference(type) or (hasattr(type,'base') and tt.is_reference(type.base))
+    return (is_ref and is_const)
+    #[Roman]If you create unit tests for this code, I will add it to type traits module
 
 def exclude_protected(cls):
-   """ Exclude all protected declarations. """
-   cls.decls(pd.access_type_matcher_t('protected'),allow_empty=True).exclude()
+    """ Exclude all protected declarations. """
+    cls.decls(pd.access_type_matcher_t('protected'),allow_empty=True).exclude()
 
 def wrap_const_ref_params(cls):
-   """ Find all member functions of cls and if they take a const& to a class
-       that does not have a destructor, then create a thin wrapper for them.
-       This works around an issue with boost.python where it needs a destructor.
-   """
-   #[Roman] Obviously, this will only work, if the function does not need other
-   #wrapper, I think, this is a new use case for Matthias "arguments policies"
-   #functionality.
-   calldefs = cls.calldefs()
+    """ Find all member functions of cls and if they take a const& to a class
+            that does not have a destructor, then create a thin wrapper for them.
+            This works around an issue with boost.python where it needs a destructor.
+    """
+    #[Roman] Obviously, this will only work, if the function does not need other
+    #wrapper, I think, this is a new use case for Matthias "arguments policies"
+    #functionality.
+    calldefs = cls.calldefs()
 
-   if None == calldefs:
-      return
+    if None == calldefs:
+        return
 
-   for c in calldefs:
-      # Skip constructors
-      if isinstance(c, pd.constructor_t):
-         continue
+    for c in calldefs:
+        # Skip constructors
+        if isinstance(c, pd.constructor_t):
+            continue
 
-      # Find arguments that need replacing
-      args_to_replace = []   # List of indices to args to replace with wrapping
-      args = c.arguments
-      for i in range(len(args)):
-         arg = args[i]
-         if is_const_ref(arg.type):
-            naked_arg = tt.remove_cv(tt.remove_reference(arg.type))
-            if tt.is_class(naked_arg):
-               class_type = naked_arg.declaration
-               if not tt.has_public_destructor(class_type):
-                  print "Found indestructible const& arg: [%s]:[%s] "%(str(c), str(arg))
-                  args_to_replace.append(i)
+        # Find arguments that need replacing
+        args_to_replace = []   # List of indices to args to replace with wrapping
+        args = c.arguments
+        for i in range(len(args)):
+            arg = args[i]
+            if is_const_ref(arg.type):
+                naked_arg = tt.remove_cv(tt.remove_reference(arg.type))
+                if tt.is_class(naked_arg):
+                    class_type = naked_arg.declaration
+                    if not tt.has_public_destructor(class_type):
+                        print "Found indestructible const& arg: [%s]:[%s] "%(str(c), str(arg))
+                        args_to_replace.append(i)
 
-      # Now replace arguments
-      if len(args_to_replace):
-         if isinstance(c, pd.operator_t) and c.symbol in ["<","==","!=","="]:
-            c.exclude()
-            continue
+        # Now replace arguments
+        if len(args_to_replace):
+            if isinstance(c, pd.operator_t) and c.symbol in ["<","==","!=","="]:
+                c.exclude()
+                continue
 
-         new_args = copy.copy(args)   # Make new copy of args so we don't modify the existing method
-         for i in args_to_replace:
-            old_arg_type = args[i].type
-            if tt.is_reference(old_arg_type) and tt.is_const(old_arg_type.base):
-               new_args[i].type = cpptypes.reference_t(tt.remove_const(old_arg_type.base))
-            elif tt.is_const(old_arg):
-               new_args[i].type = tt.remove_const(old_arg_type)
+            new_args = copy.copy(args)   # Make new copy of args so we don't modify the existing method
+            for i in args_to_replace:
+                old_arg_type = args[i].type
+                if tt.is_reference(old_arg_type) and tt.is_const(old_arg_type.base):
+                    new_args[i].type = cpptypes.reference_t(tt.remove_const(old_arg_type.base))
+                elif tt.is_const(old_arg):
+                    new_args[i].type = tt.remove_const(old_arg_type)
 
-         new_name = "%s_const_ref_wrapper"%c.name
-         args_str = [str(a) for a in new_args]
-         arg_names_str = [str(a.name) for a in new_args]
-         new_sig = "static %s %s(%s& self_arg, %s)"%(c.return_type,new_name,cls.name,",".join(args_str))
-         new_method = """%s
-         { return self_arg.%s(%s); }
-         """%(new_sig,c.name,",".join(arg_names_str))
+            new_name = "%s_const_ref_wrapper"%c.name
+            args_str = [str(a) for a in new_args]
+            arg_names_str = [str(a.name) for a in new_args]
+            new_sig = "static %s %s(%s& self_arg, %s)"%(c.return_type,new_name,cls.name,",".join(args_str))
+            new_method = """%s
+            { return self_arg.%s(%s); }
+            """%(new_sig,c.name,",".join(arg_names_str))
 
-         # Add it all
-         c.exclude()
-         cls.add_wrapper_code(new_method)
-         cls.add_code('def("%s", &%s::%s);'%(c.name, cls.wrapper_alias,new_name))
+            # Add it all
+            c.exclude()
+            
+            #[Roman] you can use cls.add_declaration_code, this could simplify the
+            #wrapper ou created, because it will generate the code within the source
+            #file, the class is generated
+            cls.add_wrapper_code(new_method)
+            
+            cls.add_code('def("%s", &%s::%s);'%(c.name, cls.wrapper_alias,new_name))


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

[pygccxml-commit] SF.net SVN: pygccxml: [449] pyplusplus_dev/contrib/goodies/goodie_utils.py

[<al...@us...>]

Revision: 449
Author:   allenb
Date:     2006-08-23 15:18:27 -0700 (Wed, 23 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/pygccxml/?rev=449&view=rev

Log Message:
-----------
Fix method and change the tab spacing back to 3 spaces.

Modified Paths:
--------------
    pyplusplus_dev/contrib/goodies/goodie_utils.py
Modified: pyplusplus_dev/contrib/goodies/goodie_utils.py
===================================================================
--- pyplusplus_dev/contrib/goodies/goodie_utils.py	2006-08-23 19:42:04 UTC (rev 448)
+++ pyplusplus_dev/contrib/goodies/goodie_utils.py	2006-08-23 22:18:27 UTC (rev 449)
@@ -12,113 +12,118 @@
 import pygccxml.declarations.cpptypes as cpptypes
 import pyplusplus.code_creators as code_creators
 import pyplusplus.decl_wrappers as decl_wrappers
+import copy
 
 
 def set_recursive_default(val):
-    pd.scopedef_t.RECURSIVE_DEFAULT = val
+   pd.scopedef_t.RECURSIVE_DEFAULT = val
 
-#[Roman]The better way is to turn virtuality from virtual to non virtual
+
 def finalize(cls):
-    """ Attempt to finalize a class by not exposing virtual methods.
-            Still exposes in the case of pure virtuals otherwise the class
-            could not be instantiated.
-    """
-    members = cls.decls( pd.virtuality_type_matcher( pd.VIRTUALITY_TYPES.VIRTUAL )
-                         , decl_type=pd.member_calldef_t
-                         , allow_empty=True)
-    members.set_virtuality( pd.VIRTUALITY_TYPES.NOT_VIRTUAL ) 
+   """ Attempt to finalize a class by not exposing virtual methods.
+         Still exposes in the case of pure virtuals otherwise the class
+         could not be instantiated.
+   """
+   if isinstance(cls, pd.mdecl_wrapper_t):
+      for x in cls:
+         finalize(x)
+   else:
+      members = cls.decls( pd.virtuality_type_matcher( pd.VIRTUALITY_TYPES.VIRTUAL )
+                        , decl_type=pd.member_calldef_t
+                        , allow_empty=True)
+      members.set_virtuality( pd.VIRTUALITY_TYPES.NOT_VIRTUAL ) 
 
 
 def add_member_function(cls, methodName, newMethod):
-    """ Add a member function to the class. """
-    cls.add_registration_code('def("%s",%s)'%(methodName, newMethod), True)
+   """ Add a member function to the class. """
+   cls.add_registration_code('def("%s",%s)'%(methodName, newMethod), True)
 
 def wrap_method(cls, methodName, newMethod):
-    """ Wrap a class method with a new method.
-            ex: c.wrapmethod(c,"doSomething","doSomethingWrapper")
-    """
-    cls[methodName].exclude()
-    add_member_function(cls, methodName, newMethod)
+   """ Wrap a class method with a new method.
+         ex: c.wrapmethod(c,"doSomething","doSomethingWrapper")
+   """
+   cls[methodName].exclude()
+   add_member_function(cls, methodName, newMethod)
 
 def add_method(moduleBuilder, methodName, method):
-    """  Add a method to the module builder. """
-    code_text = 'boost::python::def("%s",%s);'%(methodName, method)
-    moduleBuilder.code_creator.body.adopt_creator( code_creators.custom_text_t( code_text ), 0 )
-    #[Roman]moduleBuilder.add_registration_code( ... ), see relevant documentation
-    #This will add have exactly same effect as a previous line, also you don't
-    #have to build code creator first
+   """  Add a method to the module builder. """
+   code_text = 'boost::python::def("%s",%s);'%(methodName, method)
+   moduleBuilder.code_creator.body.adopt_creator( code_creators.custom_text_t( code_text ), 0 )
+   #[Roman]moduleBuilder.add_registration_code( ... ), see relevant documentation
+   #This will add have exactly same effect as a previous line, also you don't
+   #have to build code creator first
 
 
 def is_const_ref(type):
-    """ Extra trait tester method to check if something is a const reference. """
-    is_const = tt.is_const(type) or (hasattr(type,'base') and tt.is_const(type.base))
-    is_ref = tt.is_reference(type) or (hasattr(type,'base') and tt.is_reference(type.base))
-    return (is_ref and is_const)
-    #[Roman]If you create unit tests for this code, I will add it to type traits module
+   """ Extra trait tester method to check if something is a const reference. """
+   is_const = tt.is_const(type) or (hasattr(type,'base') and tt.is_const(type.base))
+   is_ref = tt.is_reference(type) or (hasattr(type,'base') and tt.is_reference(type.base))
+   return (is_ref and is_const)
+   #[Roman]If you create unit tests for this code, I will add it to type traits module
 
 def exclude_protected(cls):
-    """ Exclude all protected declarations. """
-    cls.decls(pd.access_type_matcher_t('protected'),allow_empty=True).exclude()
+   """ Exclude all protected declarations. """
+   cls.decls(pd.access_type_matcher_t('protected'),allow_empty=True).exclude()
 
 def wrap_const_ref_params(cls):
-    """ Find all member functions of cls and if they take a const& to a class
-            that does not have a destructor, then create a thin wrapper for them.
-            This works around an issue with boost.python where it needs a destructor.
-    """
-    #[Roman] Obviously, this will only work, if the function does not need other
-    #wrapper, I think, this is a new use case for Matthias "arguments policies"
-    #functionality.
-    calldefs = cls.calldefs()
+   """ Find all member functions of cls and if they take a const& to a class
+         that does not have a destructor, then create a thin wrapper for them.
+         This works around an issue with boost.python where it needs a destructor.
+   """
+   #[Roman] Obviously, this will only work, if the function does not need other
+   #wrapper, I think, this is a new use case for Matthias "arguments policies"
+   #functionality.
+   calldefs = cls.calldefs()
 
-    if None == calldefs:
-        return
+   if None == calldefs:
+      return
 
-    for c in calldefs:
-        # Skip constructors
-        if isinstance(c, pd.constructor_t):
-            continue
+   for c in calldefs:
+      # Skip constructors
+      if isinstance(c, pd.constructor_t):
+         continue
 
-        # Find arguments that need replacing
-        args_to_replace = []   # List of indices to args to replace with wrapping
-        args = c.arguments
-        for i in range(len(args)):
-            arg = args[i]
-            if is_const_ref(arg.type):
-                naked_arg = tt.remove_cv(tt.remove_reference(arg.type))
-                if tt.is_class(naked_arg):
-                    class_type = naked_arg.declaration
-                    if not tt.has_public_destructor(class_type):
-                        print "Found indestructible const& arg: [%s]:[%s] "%(str(c), str(arg))
-                        args_to_replace.append(i)
+      # Find arguments that need replacing
+      args_to_replace = []   # List of indices to args to replace with wrapping
+      args = c.arguments
+      for i in range(len(args)):
+         arg = args[i]
+         if is_const_ref(arg.type):
+            naked_arg = tt.remove_cv(tt.remove_reference(arg.type))
+            if tt.is_class(naked_arg):
+               class_type = naked_arg.declaration
+               if not tt.has_public_destructor(class_type):
+                  print "Found indestructible const& arg: [%s]:[%s] "%(str(c), str(arg))
+                  args_to_replace.append(i)
 
-        # Now replace arguments
-        if len(args_to_replace):
-            if isinstance(c, pd.operator_t) and c.symbol in ["<","==","!=","="]:
-                c.exclude()
-                continue
+      # Now replace arguments
+      if len(args_to_replace):
+         if isinstance(c, pd.operator_t) and c.symbol in ["<","==","!=","="]:
+            c.exclude()
+            continue
 
-            new_args = copy.copy(args)   # Make new copy of args so we don't modify the existing method
-            for i in args_to_replace:
-                old_arg_type = args[i].type
-                if tt.is_reference(old_arg_type) and tt.is_const(old_arg_type.base):
-                    new_args[i].type = cpptypes.reference_t(tt.remove_const(old_arg_type.base))
-                elif tt.is_const(old_arg):
-                    new_args[i].type = tt.remove_const(old_arg_type)
+         new_args = copy.copy(args)   # Make new copy of args so we don't modify the existing method
+         for i in args_to_replace:
+            old_arg_type = args[i].type
+            if tt.is_reference(old_arg_type) and tt.is_const(old_arg_type.base):
+               new_args[i].type = cpptypes.reference_t(tt.remove_const(old_arg_type.base))
+            elif tt.is_const(old_arg):
+               new_args[i].type = tt.remove_const(old_arg_type)
 
-            new_name = "%s_const_ref_wrapper"%c.name
-            args_str = [str(a) for a in new_args]
-            arg_names_str = [str(a.name) for a in new_args]
-            new_sig = "static %s %s(%s& self_arg, %s)"%(c.return_type,new_name,cls.name,",".join(args_str))
-            new_method = """%s
-            { return self_arg.%s(%s); }
-            """%(new_sig,c.name,",".join(arg_names_str))
+         new_name = "%s_const_ref_wrapper"%c.name
+         args_str = [str(a) for a in new_args]
+         arg_names_str = [str(a.name) for a in new_args]
+         new_sig = "static %s %s(%s& self_arg, %s)"%(c.return_type,new_name,cls.name,",".join(args_str))
+         new_method = """%s
+         { return self_arg.%s(%s); }
+         """%(new_sig,c.name,",".join(arg_names_str))
 
-            # Add it all
-            c.exclude()
-            
-            #[Roman] you can use cls.add_declaration_code, this could simplify the
-            #wrapper ou created, because it will generate the code within the source
-            #file, the class is generated
-            cls.add_wrapper_code(new_method)
-            
-            cls.add_code('def("%s", &%s::%s);'%(c.name, cls.wrapper_alias,new_name))
+         # Add it all
+         c.exclude()
+         
+         #[Roman] you can use cls.add_declaration_code, this could simplify the
+         #wrapper you created, because it will generate the code within the source
+         #file, the class is generated
+         cls.add_wrapper_code(new_method)
+         
+         cls.add_code('def("%s", &%s::%s);'%(c.name, cls.wrapper_alias,new_name))


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

[pygccxml-commit] SF.net SVN: pygccxml: [452] pyplusplus_dev/contrib/goodies/goodie_utils.py

[<al...@us...>]

Revision: 452
Author:   allenb
Date:     2006-08-23 16:31:55 -0700 (Wed, 23 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/pygccxml/?rev=452&view=rev

Log Message:
-----------
Add method to override allow empty setting.

Modified Paths:
--------------
    pyplusplus_dev/contrib/goodies/goodie_utils.py
Modified: pyplusplus_dev/contrib/goodies/goodie_utils.py
===================================================================
--- pyplusplus_dev/contrib/goodies/goodie_utils.py	2006-08-23 23:30:51 UTC (rev 451)
+++ pyplusplus_dev/contrib/goodies/goodie_utils.py	2006-08-23 23:31:55 UTC (rev 452)
@@ -18,6 +18,8 @@
 def set_recursive_default(val):
    pd.scopedef_t.RECURSIVE_DEFAULT = val
 
+def set_allow_empty_mdecl_default(val):
+   pd.scopedef_t.ALLOW_EMPTY_MDECL_WRAPPER = val
 
 def finalize(cls):
    """ Attempt to finalize a class by not exposing virtual methods.


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

[pygccxml-commit] SF.net SVN: pygccxml: [504] pyplusplus_dev/contrib/goodies/goodie_utils.py

[<al...@us...>]

Revision: 504
          http://svn.sourceforge.net/pygccxml/?rev=504&view=rev
Author:   allenb
Date:     2006-08-31 14:43:49 -0700 (Thu, 31 Aug 2006)

Log Message:
-----------
- Use new code inserting interfaces
- Use a "better" template instantiation method so there are no compiler warnings
- Fix a bug in const wrapper method.

Modified Paths:
--------------
    pyplusplus_dev/contrib/goodies/goodie_utils.py

Modified: pyplusplus_dev/contrib/goodies/goodie_utils.py
===================================================================
--- pyplusplus_dev/contrib/goodies/goodie_utils.py	2006-08-31 10:05:20 UTC (rev 503)
+++ pyplusplus_dev/contrib/goodies/goodie_utils.py	2006-08-31 21:43:49 UTC (rev 504)
@@ -51,10 +51,7 @@
 def add_method(moduleBuilder, methodName, method):
    """  Add a method to the module builder. """
    code_text = 'boost::python::def("%s",%s);'%(methodName, method)
-   moduleBuilder.code_creator.body.adopt_creator( code_creators.custom_text_t( code_text ), 0 )
-   #[Roman]moduleBuilder.add_registration_code( ... ), see relevant documentation
-   #This will add have exactly same effect as a previous line, also you don't
-   #have to build code creator first
+   moduleBuilder.add_registration_code(code_text)   
 
 
 def is_const_ref(type):
@@ -113,10 +110,13 @@
             elif tt.is_const(old_arg):
                new_args[i].type = tt.remove_const(old_arg_type)
 
-         new_name = "%s_const_ref_wrapper"%c.name
+         wrapper_name = "%s_const_ref_wrapper"%c.name
          args_str = [str(a) for a in new_args]
          arg_names_str = [str(a.name) for a in new_args]
-         new_sig = "static %s %s(%s& self_arg, %s)"%(c.return_type,new_name,cls.name,",".join(args_str))
+         new_sig = "static %s %s(%s& self_arg, %s)"%(c.return_type,
+                                                     wrapper_name,
+                                                     pd.full_name(cls),
+                                                     ",".join(args_str))
          new_method = """%s
          { return self_arg.%s(%s); }
          """%(new_sig,c.name,",".join(arg_names_str))
@@ -127,9 +127,10 @@
          #[Roman] you can use cls.add_declaration_code, this could simplify the
          #wrapper you created, because it will generate the code within the source
          #file, the class is generated
-         cls.add_wrapper_code(new_method)
+         cls.add_declaration_code(new_method)
          
-         cls.add_code('def("%s", &%s::%s);'%(c.name, cls.wrapper_alias,new_name))
+         cls.add_registration_code('def("%s", &%s)'%(c.name, wrapper_name), 
+                                   works_on_instance=True)
 
 
 class TemplateWrapper:
@@ -231,8 +232,8 @@
          typedef_name = t.mTypedefName
          content += """
             typedef %(template_type)s %(typedef_name)s;
-            inline void __instantiate_%(typedef_name)s()
-            { sizeof(%(typedef_name)s); }
+            inline unsigned __instantiate_%(typedef_name)s()
+            { return unsigned(sizeof(%(typedef_name)s)); }
          """ % vars()      
       
       return content


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

[pygccxml-commit] SF.net SVN: pygccxml: [505] pyplusplus_dev/contrib/goodies/goodie_utils.py

[<al...@us...>]

Revision: 505
          http://svn.sourceforge.net/pygccxml/?rev=505&view=rev
Author:   allenb
Date:     2006-09-01 07:32:52 -0700 (Fri, 01 Sep 2006)

Log Message:
-----------
Add re import.

Modified Paths:
--------------
    pyplusplus_dev/contrib/goodies/goodie_utils.py

Modified: pyplusplus_dev/contrib/goodies/goodie_utils.py
===================================================================
--- pyplusplus_dev/contrib/goodies/goodie_utils.py	2006-08-31 21:43:49 UTC (rev 504)
+++ pyplusplus_dev/contrib/goodies/goodie_utils.py	2006-09-01 14:32:52 UTC (rev 505)
@@ -14,6 +14,7 @@
 import pyplusplus.code_creators as code_creators
 import pyplusplus.decl_wrappers as decl_wrappers
 import copy
+import re
 
 
 def set_recursive_default(val):


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

[pygccxml-commit] SF.net SVN: pygccxml: [909] pyplusplus_dev/contrib/goodies/goodie_utils.py

[<al...@us...>]

Revision: 909
          http://svn.sourceforge.net/pygccxml/?rev=909&view=rev
Author:   allenb
Date:     2007-02-16 13:59:29 -0800 (Fri, 16 Feb 2007)

Log Message:
-----------
Fix up the finalize method.

Modified Paths:
--------------
    pyplusplus_dev/contrib/goodies/goodie_utils.py

Modified: pyplusplus_dev/contrib/goodies/goodie_utils.py
===================================================================
--- pyplusplus_dev/contrib/goodies/goodie_utils.py	2007-02-16 20:41:45 UTC (rev 908)
+++ pyplusplus_dev/contrib/goodies/goodie_utils.py	2007-02-16 21:59:29 UTC (rev 909)
@@ -25,7 +25,6 @@
 def set_allow_empty_mdecl_default(val):
    pd.scopedef_t.ALLOW_EMPTY_MDECL_WRAPPER = val
 
-
 def decl_from_typedef(decl):
    """ decl: decl or mdecl with typedef.  Return the "real" decl. """
    typedef_decl = decl
@@ -35,7 +34,7 @@
    return typedef_decl.type.declaration
 
    
-def finalize(cls):
+def finalize(cls, finalize_pure_virtuals=False):
    """ Attempt to finalize a class by not exposing virtual methods.
          Still exposes in the case of pure virtuals otherwise the class
          could not be instantiated.
@@ -44,10 +43,22 @@
       for x in cls:
          finalize(x)
    else:
-      members = cls.decls( pd.virtuality_type_matcher( pd.VIRTUALITY_TYPES.VIRTUAL )
-                        , decl_type=pd.member_calldef_t
-                        , allow_empty=True)
+      matcher = pd.virtuality_type_matcher( pd.VIRTUALITY_TYPES.VIRTUAL )
+      if finalize_pure_virtuals:
+         matcher = matcher | pd.virtuality_type_matcher( pd.VIRTUALITY_TYPES.PURE_VIRTUAL)
+      members = cls.decls( matcher,
+                           decl_type=pd.member_calldef_t,
+                           allow_empty=True)
       members.set_virtuality( pd.VIRTUALITY_TYPES.NOT_VIRTUAL ) 
+      
+      cls.decls(pd.access_type_matcher_t(pd.ACCESS_TYPES.PROTECTED),allow_empty=True).exclude()
+      cls.decls(pd.access_type_matcher_t(pd.ACCESS_TYPES.PRIVATE),allow_empty=True).exclude()
+      
+      wrapper_needs = cls.is_wrapper_needed()
+      if len(wrapper_needs):
+         print "Finalize failed for: ", cls.name
+         for x in wrapper_needs:
+            print "   ", x
 
 
 def add_member_function(cls, methodName, newMethod):


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

[pygccxml-commit] SF.net SVN: pygccxml: [928] pyplusplus_dev/contrib/goodies/goodie_utils.py

[<al...@us...>]

Revision: 928
          http://svn.sourceforge.net/pygccxml/?rev=928&view=rev
Author:   allenb
Date:     2007-02-24 14:10:41 -0800 (Sat, 24 Feb 2007)

Log Message:
-----------
Add documentation and fix up the protected method handling.

Modified Paths:
--------------
    pyplusplus_dev/contrib/goodies/goodie_utils.py

Modified: pyplusplus_dev/contrib/goodies/goodie_utils.py
===================================================================
--- pyplusplus_dev/contrib/goodies/goodie_utils.py	2007-02-24 22:09:52 UTC (rev 927)
+++ pyplusplus_dev/contrib/goodies/goodie_utils.py	2007-02-24 22:10:41 UTC (rev 928)
@@ -86,7 +86,7 @@
 
 def exclude_protected(cls):
    """ Exclude all protected declarations. """
-   cls.decls(pd.access_type_matcher_t('protected'),allow_empty=True).exclude()
+   cls.decls(pd.access_type_matcher_t(pd.ACCESS_TYPES.PROTECTED),allow_empty=True).exclude()
 
 def wrap_const_ref_params(cls):
    """ Find all member functions of cls and if they take a const& to a class
@@ -160,6 +160,8 @@
    """ Proxy for a template instance.  Returned from the TemplateBuilder
        to allow access to the template at a later time.
        
+       NOTE: DO NOT USE DIRECTLY.  ONLY USE AS RETURNED FROM TEMPLATE BUILDER.
+       
        TODO: If used a form that allowed multiple templates to be specified
              ex: TemplateWrapper("OSG::vector", arguments=[["float","3"],["int","4"]]
              then how would we handle naming?  Automatic or must be specified?
@@ -211,7 +213,9 @@
           tb = TemplateBuilder()
           vec3f_t = tb.Template("OSG::vector<float,3>")
           
-          # Add autogen code to a header that is included
+          header_contents = tb.buildAutogenContents()
+          # Add contents to some file that is included by module builder
+          
           mb = moduble_builder_t([myheaders])
           tb.process(mb)
           
@@ -229,6 +233,7 @@
    
    def Template(self, *args, **kw):
       """Create and add a template wrapper.
+         Returns a template wrapper that can be used to get the decl later.
       """
       temp_wrapper = TemplateWrapper(*args, **kw)
       self.mTemplates.append(temp_wrapper)


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

[pygccxml-commit] SF.net SVN: pygccxml: [957] pyplusplus_dev/contrib/goodies/goodie_utils.py

[<al...@us...>]

Revision: 957
          http://svn.sourceforge.net/pygccxml/?rev=957&view=rev
Author:   allenb
Date:     2007-03-21 15:51:36 -0700 (Wed, 21 Mar 2007)

Log Message:
-----------
- Add a fallback method of getting the template class

Modified Paths:
--------------
    pyplusplus_dev/contrib/goodies/goodie_utils.py

Modified: pyplusplus_dev/contrib/goodies/goodie_utils.py
===================================================================
--- pyplusplus_dev/contrib/goodies/goodie_utils.py	2007-03-12 12:36:39 UTC (rev 956)
+++ pyplusplus_dev/contrib/goodies/goodie_utils.py	2007-03-21 22:51:36 UTC (rev 957)
@@ -189,7 +189,12 @@
       """
       # Look up the decl from the alias db
       # XXX: I don't know if this is the best way to look up the decl, but it seems to work
-      self.mDecl = templateBuilder.mAliasDB[self.mTypedefName].declaration.type.declaration 
+      try:
+         self.mDecl = templateBuilder.mAliasDB[self.mTypedefName].declaration.type.declaration
+      except:
+         # If that didn't work, just try to get it from the first declaration
+         self.mDecl = templateBuilder.mAliasDB[self.mTypedefName].declaration
+         
       # Another method
       # decl_name = templateBuilder.mAliasDB[self.mTypedefName].declaration.name
       # decl = ns.decl(decl_name)


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