[pygccxml-commit] SF.net SVN: pygccxml: [196] pygccxml_dev/pygccxml/declarations/type_traits.py

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

Revision: 196
Author:   roman_yakovenko
Date:     2006-06-02 13:33:54 -0700 (Fri, 02 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/pygccxml/?rev=196&view=rev

Log Message:
-----------
fixing noncopyable bug

Modified Paths:
--------------
    pygccxml_dev/pygccxml/declarations/type_traits.py
Modified: pygccxml_dev/pygccxml/declarations/type_traits.py
===================================================================
--- pygccxml_dev/pygccxml/declarations/type_traits.py	2006-06-02 18:18:33 UTC (rev 195)
+++ pygccxml_dev/pygccxml/declarations/type_traits.py	2006-06-02 20:33:54 UTC (rev 196)
@@ -675,26 +675,7 @@
     """returns True if source could be converted to target, otherwise False"""
     return __is_convertible_t( source, target ).is_convertible()
     
-def is_noncopyable( class_ ):
-    if class_.class_type == class_declaration.CLASS_TYPES.UNION:
-        return False
-    for base_desc in class_.recursive_bases:
-        assert isinstance( base_desc, class_declaration.hierarchy_info_t )
-        if base_desc.related_class.decl_string in ('::boost::noncopyable', '::boost::noncopyable_::noncopyable' ):
-            return True
-        if not has_trivial_copy( base_desc.related_class ):
-            protected_ctrs = filter( lambda x: isinstance( x, calldef.constructor_t ) \
-                                               and x.is_copy_constructor
-                                     , base_desc.related_class.protected_members )
-            if not protected_ctrs:
-                return True
-        
-    if not has_trivial_copy( class_ ) \
-       or not has_public_constructor( class_ )\
-       or class_.is_abstract \
-       or ( has_destructor( class_ ) and not has_public_destructor( class_ ) ):
-        return True
-    
+def __is_noncopyable_single( class_ ):    
     #It is not enough to check base classes, we should also to check 
     #member variables. 
     mvars = filter( lambda x: isinstance( x, variable.variable_t ) 
@@ -715,6 +696,31 @@
             if is_noncopyable( cls ):
                 return True
     return False
+
+def is_noncopyable( class_ ):
+    if class_.class_type == class_declaration.CLASS_TYPES.UNION:
+        return False
+    for base_desc in class_.recursive_bases:
+        assert isinstance( base_desc, class_declaration.hierarchy_info_t )
+        if base_desc.related_class.decl_string in ('::boost::noncopyable', '::boost::noncopyable_::noncopyable' ):
+            return True
+        if not has_trivial_copy( base_desc.related_class ):
+            protected_ctrs = filter( lambda x: isinstance( x, calldef.constructor_t ) \
+                                               and x.is_copy_constructor
+                                     , base_desc.related_class.protected_members )
+            if not protected_ctrs:
+                return True
+
+        if __is_noncopyable_single( base_desc.related_class ):
+            return True
+
+    if not has_trivial_copy( class_ ) \
+       or not has_public_constructor( class_ )\
+       or class_.is_abstract \
+       or ( has_destructor( class_ ) and not has_public_destructor( class_ ) ):
+        return True
+
+    return __is_noncopyable_single( class_ )    
     
     
     
@@ -725,5 +731,4 @@
     
     
     
-    
     
\ No newline at end of file


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