A principled approach to erasing typedefs from C types (and canonicalising C types)

hs-bindgen/examples/golden/array.h

@@ -51,6 +51,9 @@ struct Example {
     int sudoku[3][3];
 };
 
+//! Typedef-in-typedef
+typedef triplet sudoku[3];
+
 /*
  * Globals
  */
@@ -107,6 +110,9 @@ int fun_7(int xss[][3]);
 //! Multi-dimensional array of unknown size, typedef
 int fun_8(tripletlist xss);
 
+//! Typedef-in-typedef
+int isSolved(sudoku xss);
+
 /*
  * Function results
  *
@@ -139,3 +145,6 @@ int (*fun_15(void))[][3];
 
 //! Multi-dimensional array of unknown size, typedef
 tripletlist *fun_16(void);
+
+//! Typedef-in-typedef
+sudoku * solve(void);

hs-bindgen/fixtures/adios.hs

@@ -763,7 +763,8 @@
           "/* get_\978\978\978_ptr */ __attribute__ ((const)) signed int const *hs_bindgen_test_adios_c538a25ba7055dd4 (void) { return &\978\978\978; } ",
           capiWrapperImport = "adios.h"},
       foreignImportOrigin = Global
-        (TypeConst
+        (TypeQualified
+          TypeQualifierConst
           (TypePrim
             (PrimIntegral PrimInt Signed))),
       foreignImportComment = Nothing,

hs-bindgen/fixtures/adios.tree-diff.txt

@@ -132,7 +132,8 @@ TranslationUnit {
             headerInclude = "adios.h"},
         declComment = Nothing},
       declKind = DeclGlobal
-        (TypeConst
+        (TypeQualified
+          TypeQualifierConst
           (TypePrim
             (PrimIntegral PrimInt Signed))),
       declSpec = DeclSpec

hs-bindgen/fixtures/array.bindingspec.yaml

@@ -25,6 +25,14 @@ types:
   - Eq
   - Show
   - Storable
+- headers: array.h
+  cname: sudoku
+  module: Example
+  hsname: Sudoku
+  instances:
+  - Eq
+  - Show
+  - Storable
 - headers: array.h
   cname: triplet
   module: Example