don't warn about const structs

Author: davidmalcolm

generate-tree-c.py

@@ -388,6 +388,10 @@ def add_complex_getter(name, doc):
                 add_simple_getter('%s_equivalent' % qual,
                                   'PyGccTree_New(gcc_private_make_tree(build_qualified_type(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',
+                              'PyBool_FromLong(TYPE_READONLY(self->t.inner))',
+                              "Boolean: does this type have the 'const' modifier?")
 
         if tree_type.SYM == 'INTEGER_TYPE':
             add_simple_getter('unsigned',

tests/examples/find-global-state/input.c

@@ -57,3 +57,14 @@ int test6()
 {
   return bar.f;
 }
+
+struct banana {
+  int f;
+};
+
+const struct banana a_banana;
+
+int test7()
+{
+  return a_banana.f;
+}

tests/examples/find-global-state/script.py

@@ -20,6 +20,22 @@
 
 DEBUG=0
 
+def is_const(type_):
+    if DEBUG:
+        type_.debug()
+
+    if hasattr(type_, 'const'):
+        if type_.const:
+            return True
+
+    # Don't bother warning about an array of const e.g.
+    # const char []
+    if isinstance(type_, gcc.ArrayType):
+        item_type = type_.dereference
+        if is_const(item_type):
+            return True
+
+
 class StateFinder:
     def __init__(self):
         # Locate all declarations of variables holding "global" state:
@@ -28,13 +44,14 @@ def __init__(self):
         for var in gcc.get_variables():
             type_ = var.decl.type
 
-            # Don't bother warning about an array of const e.g.
-            # const char []
-            if isinstance(type_, gcc.ArrayType):
-                item_type = type_.dereference
-                if hasattr(item_type, 'const'):
-                    if item_type.const:
-                        continue
+            if DEBUG:
+                print('var.decl: %r' % var.decl)
+                print(type_)
+
+            # Don't bother warning about const data:
+            if is_const(type_):
+                continue
+
             self.global_decls.add(var.decl)
         if DEBUG:
             print('self.global_decls: %r' % self.global_decls)