-typedef struct type_t type_t;
-typedef struct atomic_type_t atomic_type_t;
-typedef struct pointer_type_t pointer_type_t;
-typedef struct method_parameter_type_t method_parameter_type_t;
-typedef struct method_type_t method_type_t;
-typedef struct compound_type_t compound_type_t;
-typedef struct enum_entry_t enum_entry_t;
-typedef struct enum_type_t enum_type_t;
-typedef struct builtin_type_t builtin_type_t;
+/* note that the constant values represent the rank of the types as defined
+ * in ยง 6.3.1 */
+typedef enum {
+ ATOMIC_TYPE_INVALID = 0,
+ ATOMIC_TYPE_VOID,
+ ATOMIC_TYPE_CHAR,
+ ATOMIC_TYPE_SCHAR,
+ ATOMIC_TYPE_UCHAR,
+ ATOMIC_TYPE_SHORT,
+ ATOMIC_TYPE_USHORT,
+ ATOMIC_TYPE_INT,
+ ATOMIC_TYPE_UINT,
+ ATOMIC_TYPE_LONG,
+ ATOMIC_TYPE_ULONG,
+ ATOMIC_TYPE_LONGLONG,
+ ATOMIC_TYPE_ULONGLONG,
+ ATOMIC_TYPE_FLOAT,
+ ATOMIC_TYPE_DOUBLE,
+ ATOMIC_TYPE_LONG_DOUBLE,
+ ATOMIC_TYPE_BOOL,
+
+ ATOMIC_TYPE_FLOAT_COMPLEX,
+ ATOMIC_TYPE_DOUBLE_COMPLEX,
+ ATOMIC_TYPE_LONG_DOUBLE_COMPLEX,
+ ATOMIC_TYPE_FLOAT_IMAGINARY,
+ ATOMIC_TYPE_DOUBLE_IMAGINARY,
+ ATOMIC_TYPE_LONG_DOUBLE_IMAGINARY,
+
+ ATOMIC_TYPE_LAST = ATOMIC_TYPE_LONG_DOUBLE_IMAGINARY
+} atomic_type_kind_t;
+
+typedef struct type_base_t type_base_t;
+typedef struct atomic_type_t atomic_type_t;
+typedef struct pointer_type_t pointer_type_t;
+typedef struct function_parameter_t function_parameter_t;
+typedef struct function_type_t function_type_t;
+typedef struct compound_type_t compound_type_t;
+typedef struct enum_type_t enum_type_t;
+typedef struct builtin_type_t builtin_type_t;
+typedef struct array_type_t array_type_t;
+typedef struct typedef_type_t typedef_type_t;
+typedef struct bitfield_type_t bitfield_type_t;
+typedef struct typeof_type_t typeof_type_t;
+typedef union type_t type_t;