gcc-c-api: add 'dereference' attribute to array_type, pointer_type, vector_type

Author: davidmalcolm

gcc-c-api/gcc-type.c

@@ -28,6 +28,14 @@
   Types
 */
 
+GCC_IMPLEMENT_PRIVATE_API (gcc_type)
+gcc_private_make_type (tree inner)
+{
+  struct gcc_type result;
+  result.inner = inner;
+  return result;
+}
+
 GCC_IMPLEMENT_PRIVATE_API (gcc_pointer_type)
 gcc_private_make_pointer_type (tree inner)
 {
@@ -54,6 +62,12 @@ gcc_type_get_pointer (gcc_type node)
 /***************************************************************************
  gcc_array_type
  **************************************************************************/
+GCC_IMPLEMENT_PUBLIC_API(gcc_type)
+gcc_array_type_get_dereference(gcc_array_type node)
+{
+  return gcc_private_make_type (TREE_TYPE (node.inner));
+}
+
 /***************************************************************************
  gcc_boolean_type
  **************************************************************************/
@@ -147,6 +161,12 @@ gcc_private_make_integer_constant (tree inner)
 /***************************************************************************
  gcc_pointer_type
  **************************************************************************/
+GCC_IMPLEMENT_PUBLIC_API(gcc_type)
+gcc_pointer_type_get_dereference(gcc_pointer_type node)
+{
+  return gcc_private_make_type (TREE_TYPE (node.inner));
+}
+
 /***************************************************************************
  gcc_protocol_interface_type
  **************************************************************************/
@@ -198,6 +218,12 @@ gcc_real_type_get_precision (gcc_real_type node)
 /***************************************************************************
  gcc_vector_type
  **************************************************************************/
+GCC_IMPLEMENT_PUBLIC_API(gcc_type)
+gcc_vector_type_get_dereference(gcc_vector_type node)
+{
+  return gcc_private_make_type (TREE_TYPE (node.inner));
+}
+
 /***************************************************************************
  gcc_void_type
  **************************************************************************/

gcc-c-api/type.xml

@@ -27,6 +27,9 @@
   </type>
 
   <type name="array_type" base="type">
+    <attribute name="dereference" kind="type">
+      <doc>The type that this type points to</doc>
+    </attribute>
   </type>
 
   <type name="boolean_type" base="type">
@@ -88,6 +91,9 @@
   </type>
 
   <type name="pointer_type" base="type">
+    <attribute name="dereference" kind="type">
+      <doc>The type that this type points to</doc>
+    </attribute>
   </type>
 
   <type name="protocol_interface_type" base="type">
@@ -136,6 +142,9 @@
   </type>
 
   <type name="vector_type" base="type">
+    <attribute name="dereference" kind="type">
+      <doc>The type that this type points to</doc>
+    </attribute>
   </type>
 
   <type name="void_type" base="type">

generate-tree-c.py

@@ -422,8 +422,10 @@ def add_complex_getter(name, doc):
                               'The precision of this type in bits, as an int (e.g. 32)')
 
         if tree_type.SYM in ('POINTER_TYPE', 'ARRAY_TYPE', 'VECTOR_TYPE'):
+            prefix = 'gcc_%s' % tree_type.SYM.lower()
             add_simple_getter('dereference',
-                              'PyGccTree_New(gcc_private_make_tree(TREE_TYPE(self->t.inner)))',
+                              ('PyGccTree_New(gcc_type_as_gcc_tree(%s_get_dereference(PyGccTree_as_%s(self))))'
+                               % (prefix, prefix)),
                               "The gcc.Type that this type points to'")
 
         if tree_type.SYM == 'POINTER_TYPE':