fix 2779781 bug( pygccxml reverses array dimensions )

Author: roman_yakovenko

pygccxml/declarations/cpptypes.py

@@ -446,7 +446,22 @@ def _set_size(self, size):#sometimes there is a need to update the size of the a
                      doc="returns array size" )
 
     def build_decl_string(self, with_defaults=True):
-        return self.base.build_decl_string(with_defaults) + '[%d]' %  self.size
+        #return self.base.build_decl_string(with_defaults) + '[%d]' %  self.size
+        return self.__bds_for_multi_dim_arrays( None, with_defaults )
+
+    def __bds_for_multi_dim_arrays(self, parent_dims=None, with_defaults=True):
+        if parent_dims:
+            parent_dims.append( self.size )
+        else:
+            parent_dims = [self.size]
+
+        if isinstance( self.base, array_t ):
+            return self.base.__bds_for_multi_dim_arrays( parent_dims, with_defaults)
+        else:
+            tmp = []
+            for s in parent_dims:
+                tmp.append( '[%d]' % s )
+            return self.base.build_decl_string(with_defaults) + ''.join( tmp )
 
     def _clone_impl( self ):
         return array_t( self.base.clone(), self.size )

unittests/array_bug_tester.py

@@ -0,0 +1,58 @@
+# Copyright 2004-2008 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)
+
+import os
+import unittest
+import autoconfig
+import parser_test_case
+
+from pygccxml import utils
+from pygccxml import parser
+from pygccxml import declarations
+
+
+class tester_t( parser_test_case.parser_test_case_t ):
+    def __init__(self, *args):
+        parser_test_case.parser_test_case_t.__init__(self, *args)
+
+    def test1(self):
+        code = 'int aaaa[2][3][4][5];'
+        src_reader = parser.source_reader_t( self.config )
+        global_ns = declarations.get_global_namespace( src_reader.read_string( code ) )
+        aaaa_type = global_ns.var('aaaa').type
+        self.failUnless( 'int[2][3][4][5]' == aaaa_type.decl_string, aaaa_type.decl_string )
+
+    def test2(self):
+        code = 'int* aaaa[2][3][4][5];'
+        src_reader = parser.source_reader_t( self.config )
+        global_ns = declarations.get_global_namespace( src_reader.read_string( code ) )
+        aaaa_type = global_ns.var('aaaa').type
+        self.failUnless( 'int *[2][3][4][5]' == aaaa_type.decl_string, aaaa_type.decl_string )
+
+    def test3(self):
+        code = 'int aaaa[2];'
+        src_reader = parser.source_reader_t( self.config )
+        global_ns = declarations.get_global_namespace( src_reader.read_string( code ) )
+        aaaa_type = global_ns.var('aaaa').type
+        self.failUnless( 'int[2]' == aaaa_type.decl_string, aaaa_type.decl_string )
+
+    def test4(self):
+        code = 'struct xyz{}; xyz aaaa[2][3];'
+        src_reader = parser.source_reader_t( self.config )
+        global_ns = declarations.get_global_namespace( src_reader.read_string( code ) )
+        aaaa_type = global_ns.var('aaaa').type
+        self.failUnless( '::xyz[2][3]' == aaaa_type.decl_string, aaaa_type.decl_string )
+
+
+def create_suite():
+    suite = unittest.TestSuite()
+    suite.addTest( unittest.makeSuite(tester_t))
+    return suite
+
+def run_suite():
+    unittest.TextTestRunner(verbosity=2).run( create_suite() )
+
+if __name__ == "__main__":
+    run_suite()

unittests/test_all.py

@@ -54,6 +54,7 @@
 import undname_creator_tester
 import calling_convention_tester
 import const_volatile_arg_tester
+import array_bug_tester
 
 testers = [
     decl_string_tester
@@ -104,6 +105,7 @@
     , undname_creator_tester
     , calling_convention_tester
     , const_volatile_arg_tester
+    , array_bug_tester
 ]
 
 def create_suite():