preserve qualifiers when adding more qualifiers

Fixes #33

Author: tromey

generate-tree-c.py

@@ -396,7 +396,7 @@ def add_complex_getter(name, doc):
                                   'PyBool_FromLong(TYPE_QUALS(self->t.inner) & TYPE_QUAL_%s)' % qual.upper(),
                                   "Boolean: does this type have the '%s' modifier?" % qual)
                 add_simple_getter('%s_equivalent' % qual,
-                                  'PyGccTree_New(gcc_private_make_tree(build_qualified_type(self->t.inner, TYPE_QUAL_%s)))' % qual.upper(),
+                                  'PyGccTree_New(gcc_private_make_tree(build_qualified_type(self->t.inner, TYPE_QUALS(self->t.inner) | TYPE_QUAL_%s)))' % qual.upper(),
                                   'The gcc.Type for the %s version of this type' % qual)
         if tree_type.SYM == 'RECORD_TYPE':
             add_simple_getter('const',

tests/plugin/types/script.py

@@ -39,6 +39,11 @@ def dump_integer_type(t):
     dump_integer_type(gcc.Type.unsigned_char())
     dump_integer_type(gcc.Type.signed_char())
 
+    print(gcc.Type.char().const)
+    print(gcc.Type.char().const_equivalent.const)
+    print(gcc.Type.char().const_equivalent.restrict_equivalent.const)
+    print(gcc.Type.char().const_equivalent.volatile_equivalent.const)
+
     def dump_real_type(t):
         print('gcc.Type: %r' % str(t))
         print('  t.const: %r' % t.const)

tests/plugin/types/stdout.txt

@@ -12,6 +12,10 @@ gcc.Type: 'signed char'
   t.min_value.constant: -128
   t.max_value.constant: 127
   t.sizeof: 1
+False
+True
+True
+True
 gcc.Type: 'float'
   t.const: False
   t.precision: 32