improve decl_printer - sort declarations before printing

Author: roman_yakovenko

pygccxml/declarations/decl_printer.py

@@ -208,6 +208,8 @@ def print_hierarchy(hierarchy_type, classes, curr_level):
                     self.writer( ' ' * (curr_level + 1)* self.INDENT_SIZE + is_virtual.ljust( self.JUSTIFY ) + os.linesep)
 
         def print_members(members_type, members, curr_level):
+            members = members[:]
+            members.sort()
             self.writer( ' ' * curr_level * self.INDENT_SIZE + members_type.ljust( self.JUSTIFY ) + os.linesep)
             if self.__recursive:
                 curr_level += 1
@@ -240,7 +242,9 @@ def visit_namespace(self ):
             return #don't print info about empty namespaces
         self.print_decl_header()
         if self.__recursive:
-            for decl in self.__inst.declarations:
+            inst_decls = self.__inst.declarations[:]
+            inst_decls.sort()
+            for decl in inst_decls:
                 if self.is_builtin_decl( decl ):
                     continue
                 prn = self.clone()

unittests/project_reader_correctness_tester.py

@@ -67,16 +67,14 @@ def test(self):
                                            , compilation_mode=parser.COMPILATION_MODE.FILE_BY_FILE )
         src_reader = parser.source_reader_t( self.config )
         src_decls = src_reader.read_file( 'separate_compilation/all.h' )
-        if src_decls != prj_decls:
-            s = src_decls[0]
-            p = prj_decls[0]
-            sr = file( os.path.join( autoconfig.build_directory , 'separate_compilation.sr.txt'),'w+b' )
-            pr = file( os.path.join( autoconfig.build_directory , 'separate_compilation.pr.txt'), 'w+b' )
-            declarations.print_declarations( s, writer=lambda l: sr.write( l ) )
-            declarations.print_declarations( p, writer=lambda l: pr.write( l ) )
-            sr.close()
-            pr.close()
-            self.fail( "Expected - There is a difference between declarations" )
+        
+        declarations.dump_declarations( src_decls
+                                        , os.path.join( autoconfig.build_directory, 'separate_compilation.sr.txt' ) )
+
+        declarations.dump_declarations( prj_decls
+                                        , os.path.join( autoconfig.build_directory, 'separate_compilation.pr.txt' ) )
+
+        self.failUnless( src_decls == prj_decls, "There is a difference between declarations" )
 
 
 def create_suite():