Refactor declaration index to contain one map with sum type

Author: dschrempf

hs-bindgen/examples/golden/declarations/select_scoping.h

@@ -2,7 +2,6 @@
 // select!
 #include "select_scoping_header.h"
 
-
 // This declaration is parsed _and_ selected.
 typedef int ParsedAndSelected1;
 
@@ -12,4 +11,4 @@ typedef ParsedAndNotSelected ParsedAndSelected2;
 
 // This declaration is parsed _and_ selected. The dependency is _not_ parsed nor
 // selected (custom parse predicate).
-typedef struct PossiblyNotParsedDefinitelyNotSelected ParsedAndSelected3;
+typedef struct ParseNotAttemptedNotSelected ParsedAndSelected3;

hs-bindgen/examples/golden/declarations/select_scoping_header.h

@@ -4,6 +4,6 @@ typedef int ParsedAndNotSelected;
 
 // This declaration is _not_ parsed by the test, which uses a custom parse
 // predicate.
-struct PossiblyNotParsedDefinitelyNotSelected {
+struct ParseNotAttemptedNotSelected {
   int x;
 };

hs-bindgen/examples/golden/edge-cases/duplicate.h

@@ -0,0 +1,3 @@
+#include "duplicate_macro.h"
+
+void function(duplicate x);

hs-bindgen/examples/golden/edge-cases/duplicate_macro.h

@@ -0,0 +1,2 @@
+typedef int duplicate;
+#define duplicate duplicate

hs-bindgen/fixtures/declarations/select_scoping/Example.pp.hs

@@ -26,7 +26,7 @@ import Prelude (Bounded, Enum, Eq, Integral, Num, Ord, Read, Real, Show)
 
 {-| __C declaration:__ @ParsedAndSelected1@
 
-    __defined at:__ @declarations\/select_scoping.h:7:13@
+    __defined at:__ @declarations\/select_scoping.h:6:13@
 
     __exported by:__ @declarations\/select_scoping.h@
 -}

hs-bindgen/fixtures/declarations/select_scoping/th.txt

@@ -2,15 +2,15 @@
 -- addDependentFile examples/golden/declarations/select_scoping.h
 {-| __C declaration:__ @ParsedAndSelected1@
 
-    __defined at:__ @declarations\/select_scoping.h:7:13@
+    __defined at:__ @declarations\/select_scoping.h:6:13@
 
     __exported by:__ @declarations\/select_scoping.h@
 -}
 newtype ParsedAndSelected1
     = ParsedAndSelected1 {un_ParsedAndSelected1 :: CInt}
       {- ^ __C declaration:__ @ParsedAndSelected1@
 
-           __defined at:__ @declarations\/select_scoping.h:7:13@
+           __defined at:__ @declarations\/select_scoping.h:6:13@
 
            __exported by:__ @declarations\/select_scoping.h@
       -}

hs-bindgen/fixtures/edge-cases/duplicate/Example.pp.hs

@@ -0,0 +1 @@
+module Example () where

hs-bindgen/fixtures/edge-cases/duplicate/Example/FunPtr.pp.hs

@@ -0,0 +1 @@
+module Example.FunPtr () where

hs-bindgen/fixtures/edge-cases/duplicate/Example/Global.pp.hs

@@ -0,0 +1 @@
+module Example.Global () where

hs-bindgen/fixtures/edge-cases/duplicate/Example/Safe.pp.hs

@@ -0,0 +1 @@
+module Example.Safe () where