Binding specifications: separate C and Haskell specs

hs-bindgen/fixtures/anonymous.bindingspec.yaml

@@ -11,47 +11,47 @@ types:
   - Show
   - Storable
 - headers: anonymous.h
-  cname: S1_c
+  cname: struct S2
   module: Example
-  identifier: S1_c
+  identifier: S2
   instances:
   - Eq
   - Show
   - Storable
 - headers: anonymous.h
-  cname: struct S2
+  cname: struct S3
   module: Example
-  identifier: S2
+  identifier: S3
   instances:
   - Eq
   - Show
   - Storable
 - headers: anonymous.h
-  cname: S2_inner
+  cname: struct @S1_c
   module: Example
-  identifier: S2_inner
+  identifier: S1_c
   instances:
   - Eq
   - Show
   - Storable
 - headers: anonymous.h
-  cname: S2_inner_deep
+  cname: struct @S2_inner
   module: Example
-  identifier: S2_inner_deep
+  identifier: S2_inner
   instances:
   - Eq
   - Show
   - Storable
 - headers: anonymous.h
-  cname: struct S3
+  cname: struct @S2_inner_deep
   module: Example
-  identifier: S3
+  identifier: S2_inner_deep
   instances:
   - Eq
   - Show
   - Storable
 - headers: anonymous.h
-  cname: S3_c
+  cname: struct @S3_c
   module: Example
   identifier: S3_c
   instances:

hs-bindgen/fixtures/attributes.bindingspec.yaml

@@ -19,23 +19,23 @@ types:
   - Show
   - Storable
 - headers: attributes.h
-  cname: baz
+  cname: struct foo
   module: Example
-  identifier: Baz
+  identifier: Foo
   instances:
   - Eq
   - Show
   - Storable
 - headers: attributes.h
-  cname: struct foo
+  cname: struct @baz
   module: Example
-  identifier: Foo
+  identifier: Baz
   instances:
   - Eq
   - Show
   - Storable
 - headers: attributes.h
-  cname: qux
+  cname: struct @qux
   module: Example
   identifier: Qux
   instances:

hs-bindgen/fixtures/distilled_lib_1.bindingspec.yaml

@@ -21,65 +21,65 @@ types:
   - Real
   - Storable
 - headers: distilled_lib_1.h
-  cname: a_typedef_enum_e
+  cname: struct a_typedef_struct
   module: Example
-  identifier: A_typedef_enum_e
+  identifier: A_typedef_struct_t
   instances:
   - Eq
-  - Ord
-  - Read
   - Show
   - Storable
 - headers: distilled_lib_1.h
-  cname: struct a_typedef_struct
+  cname: callback_t
   module: Example
-  identifier: A_typedef_struct_t
+  identifier: Callback_t
   instances:
   - Eq
+  - Ord
   - Show
   - Storable
 - headers: distilled_lib_1.h
-  cname: another_typedef_enum_e
+  cname: var_t
   module: Example
-  identifier: Another_typedef_enum_e
+  identifier: Var_t
   instances:
   - Eq
   - Ord
+  - Enum
+  - Ix
+  - Bounded
   - Read
   - Show
+  - Bits
+  - FiniteBits
+  - Integral
+  - Num
+  - Real
   - Storable
 - headers: distilled_lib_1.h
-  cname: another_typedef_struct_t
+  cname: enum @a_typedef_enum_e
   module: Example
-  identifier: Another_typedef_struct_t
+  identifier: A_typedef_enum_e
   instances:
   - Eq
+  - Ord
+  - Read
   - Show
   - Storable
 - headers: distilled_lib_1.h
-  cname: callback_t
+  cname: enum @another_typedef_enum_e
   module: Example
-  identifier: Callback_t
+  identifier: Another_typedef_enum_e
   instances:
   - Eq
   - Ord
+  - Read
   - Show
   - Storable
 - headers: distilled_lib_1.h
-  cname: var_t
+  cname: struct @another_typedef_struct_t
   module: Example
-  identifier: Var_t
+  identifier: Another_typedef_struct_t
   instances:
   - Eq
-  - Ord
-  - Enum
-  - Ix
-  - Bounded
-  - Read
   - Show
-  - Bits
-  - FiniteBits
-  - Integral
-  - Num
-  - Real
   - Storable

hs-bindgen/fixtures/doxygen_docs.bindingspec.yaml

@@ -2,14 +2,6 @@ version:
   hs_bindgen: 0.1.0
   binding_specification: '1.0'
 types:
-- headers: doxygen_docs.h
-  cname: bitfield_t
-  module: Example
-  identifier: Bitfield_t
-  instances:
-  - Eq
-  - Show
-  - Storable
 - headers: doxygen_docs.h
   cname: enum color_enum
   module: Example
@@ -20,28 +12,6 @@ types:
   - Read
   - Show
   - Storable
-- headers: doxygen_docs.h
-  cname: config_t
-  module: Example
-  identifier: Config_t
-  instances:
-  - Eq
-  - Show
-  - Storable
-- headers: doxygen_docs.h
-  cname: data_union_t
-  module: Example
-  identifier: Data_union_t
-  instances:
-  - Storable
-- headers: doxygen_docs.h
-  cname: data_union_t_as_parts
-  module: Example
-  identifier: Data_union_t_as_parts
-  instances:
-  - Eq
-  - Show
-  - Storable
 - headers: doxygen_docs.h
   cname: event_callback_t
   module: Example
@@ -103,7 +73,37 @@ types:
   - Real
   - Storable
 - headers: doxygen_docs.h
-  cname: status_code_t
+  cname: struct @bitfield_t
+  module: Example
+  identifier: Bitfield_t
+  instances:
+  - Eq
+  - Show
+  - Storable
+- headers: doxygen_docs.h
+  cname: struct @config_t
+  module: Example
+  identifier: Config_t
+  instances:
+  - Eq
+  - Show
+  - Storable
+- headers: doxygen_docs.h
+  cname: union @data_union_t
+  module: Example
+  identifier: Data_union_t
+  instances:
+  - Storable
+- headers: doxygen_docs.h
+  cname: struct @data_union_t_as_parts
+  module: Example
+  identifier: Data_union_t_as_parts
+  instances:
+  - Eq
+  - Show
+  - Storable
+- headers: doxygen_docs.h
+  cname: enum @status_code_t
   module: Example
   identifier: Status_code_t
   instances:

hs-bindgen/fixtures/enum_cpp_syntax.bindingspec.yaml

@@ -3,7 +3,7 @@ version:
   binding_specification: '1.0'
 types:
 - headers: enum_cpp_syntax.h
-  cname: foo_enum
+  cname: enum @foo_enum
   module: Example
   identifier: Foo_enum
   instances:

hs-bindgen/fixtures/enums.bindingspec.yaml

@@ -2,16 +2,6 @@ version:
   hs_bindgen: 0.1.0
   binding_specification: '1.0'
 types:
-- headers: enums.h
-  cname: enumA
-  module: Example
-  identifier: EnumA
-  instances:
-  - Eq
-  - Ord
-  - Read
-  - Show
-  - Storable
 - headers: enums.h
   cname: enum enumB
   module: Example
@@ -92,3 +82,13 @@ types:
   - Read
   - Show
   - Storable
+- headers: enums.h
+  cname: enum @enumA
+  module: Example
+  identifier: EnumA
+  instances:
+  - Eq
+  - Ord
+  - Read
+  - Show
+  - Storable

hs-bindgen/fixtures/flam.bindingspec.yaml

@@ -19,25 +19,25 @@ types:
   - Show
   - Storable
 - headers: flam.h
-  cname: foo_bar
+  cname: struct pascal
   module: Example
-  identifier: Foo_bar
+  identifier: Pascal
   instances:
   - Eq
   - Show
   - Storable
 - headers: flam.h
-  cname: struct pascal
+  cname: struct triplets
   module: Example
-  identifier: Pascal
+  identifier: Triplets
   instances:
   - Eq
   - Show
   - Storable
 - headers: flam.h
-  cname: struct triplets
+  cname: struct @foo_bar
   module: Example
-  identifier: Triplets
+  identifier: Foo_bar
   instances:
   - Eq
   - Show

hs-bindgen/fixtures/fun_attributes.bindingspec.yaml

@@ -2,14 +2,6 @@ version:
   hs_bindgen: 0.1.0
   binding_specification: '1.0'
 types:
-- headers: fun_attributes.h
-  cname: FILE
-  module: Example
-  identifier: FILE
-  instances:
-  - Eq
-  - Show
-  - Storable
 - headers: fun_attributes.h
   cname: size_t
   module: Example
@@ -28,3 +20,11 @@ types:
   - Num
   - Real
   - Storable
+- headers: fun_attributes.h
+  cname: struct @FILE
+  module: Example
+  identifier: FILE
+  instances:
+  - Eq
+  - Show
+  - Storable

hs-bindgen/fixtures/globals.bindingspec.yaml

@@ -44,31 +44,31 @@ types:
   - Show
   - Storable
 - headers: globals.h
-  cname: struct1_t
+  cname: struct tuple
   module: Example
-  identifier: Struct1_t
+  identifier: Tuple
   instances:
   - Eq
   - Show
   - Storable
 - headers: globals.h
-  cname: struct2_t
+  cname: struct @struct1_t
   module: Example
-  identifier: Struct2_t
+  identifier: Struct1_t
   instances:
   - Eq
   - Show
   - Storable
 - headers: globals.h
-  cname: struct tuple
+  cname: struct @struct2_t
   module: Example
-  identifier: Tuple
+  identifier: Struct2_t
   instances:
   - Eq
   - Show
   - Storable
 - headers: globals.h
-  cname: version_t
+  cname: struct @version_t
   module: Example
   identifier: Version_t
   instances: