[pygccxml-commit] SF.net SVN: pygccxml: [220] pygccxml_dev/pygccxml/declarations

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

Revision: 220
Author:   roman_yakovenko
Date:     2006-06-17 11:09:21 -0700 (Sat, 17 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/pygccxml/?rev=220&view=rev

Log Message:
-----------
fixing small bug in vector_traits

Modified Paths:
--------------
    pygccxml_dev/pygccxml/declarations/cpptypes.py
    pygccxml_dev/pygccxml/declarations/filters.py
    pygccxml_dev/pygccxml/declarations/type_traits.py
Modified: pygccxml_dev/pygccxml/declarations/cpptypes.py
===================================================================
--- pygccxml_dev/pygccxml/declarations/cpptypes.py	2006-06-17 06:29:46 UTC (rev 219)
+++ pygccxml_dev/pygccxml/declarations/cpptypes.py	2006-06-17 18:09:21 UTC (rev 220)
@@ -466,8 +466,11 @@
         has_const_str = ''
         if has_const:
             has_const_str = 'const'
+        return_type_decl_string = ''
+        if return_type:
+            return_type_decl_string = return_type.decl_string
         return member_function_type_t.NAME_TEMPLATE % { 
-              'return_type' : return_type.decl_string 
+              'return_type' : return_type_decl_string 
             , 'class' : class_decl_string
             , 'arguments' : ','.join( map( lambda x: x.decl_string, arguments_types ) )
             , 'has_const' : has_const_str }                                          

Modified: pygccxml_dev/pygccxml/declarations/filters.py
===================================================================
--- pygccxml_dev/pygccxml/declarations/filters.py	2006-06-17 06:29:46 UTC (rev 219)
+++ pygccxml_dev/pygccxml/declarations/filters.py	2006-06-17 18:09:21 UTC (rev 220)
@@ -201,7 +201,9 @@
         if not None is self.decl_type:
             if not isinstance( decl, self.decl_type ):
                 return False
-        if not None is self.name:
+        if not None is self.name:
+            if 'SubMeshLodGeometryLink' in decl.decl_string:
+                i = 0
             if not self.check_name( decl ):
                 return False
         if not None is self.header_dir and decl.location:

Modified: pygccxml_dev/pygccxml/declarations/type_traits.py
===================================================================
--- pygccxml_dev/pygccxml/declarations/type_traits.py	2006-06-17 06:29:46 UTC (rev 219)
+++ pygccxml_dev/pygccxml/declarations/type_traits.py	2006-06-17 18:09:21 UTC (rev 220)
@@ -805,7 +805,11 @@
             return remove_declarated( cls.typedef( "value_type" ).type )
         else:
             value_type_str = templates.args( cls.name )[0]
-            found = cls.top_parent.classes( value_type_str, allow_empty=True )
+            if not value_type_str.startswith( '::' ):
+                value_type_str = '::' + value_type_str
+            found = cls.top_parent.decls( name=value_type_str
+                                          , function=lambda decl: not isinstance( decl, calldef.calldef_t )
+                                          ,  allow_empty=True )
             if not found:
                 if cpptypes.FUNDAMENTAL_TYPES.has_key( value_type_str ):
                     return cpptypes.FUNDAMENTAL_TYPES[value_type_str]


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