Distinguish tag kind in anonymous QualName

TravisCardwell · TravisCardwell · commit 4a72843620f2 · 2025-09-26T16:23:06.000+09:00
With this change, we now write `struct @foo` instead of just `@foo`.
diff --git a/hs-bindgen/fixtures/anonymous.bindingspec.yaml b/hs-bindgen/fixtures/anonymous.bindingspec.yaml
@@ -27,31 +27,31 @@ types:
   - Show
   - Storable
 - headers: anonymous.h
-  cname: '@S1_c'
+  cname: struct @S1_c
   module: Example
   identifier: S1_c
   instances:
   - Eq
   - Show
   - Storable
 - headers: anonymous.h
-  cname: '@S2_inner'
+  cname: struct @S2_inner
   module: Example
   identifier: S2_inner
   instances:
   - Eq
   - Show
   - Storable
 - headers: anonymous.h
-  cname: '@S2_inner_deep'
+  cname: struct @S2_inner_deep
   module: Example
   identifier: S2_inner_deep
   instances:
   - Eq
   - Show
   - Storable
 - headers: anonymous.h
-  cname: '@S3_c'
+  cname: struct @S3_c
   module: Example
   identifier: S3_c
   instances:
diff --git a/hs-bindgen/fixtures/attributes.bindingspec.yaml b/hs-bindgen/fixtures/attributes.bindingspec.yaml
@@ -27,15 +27,15 @@ types:
   - Show
   - Storable
 - headers: attributes.h
-  cname: '@baz'
+  cname: struct @baz
   module: Example
   identifier: Baz
   instances:
   - Eq
   - Show
   - Storable
 - headers: attributes.h
-  cname: '@qux'
+  cname: struct @qux
   module: Example
   identifier: Qux
   instances:
diff --git a/hs-bindgen/fixtures/distilled_lib_1.bindingspec.yaml b/hs-bindgen/fixtures/distilled_lib_1.bindingspec.yaml
@@ -56,7 +56,7 @@ types:
   - Real
   - Storable
 - headers: distilled_lib_1.h
-  cname: '@a_typedef_enum_e'
+  cname: enum @a_typedef_enum_e
   module: Example
   identifier: A_typedef_enum_e
   instances:
@@ -66,7 +66,7 @@ types:
   - Show
   - Storable
 - headers: distilled_lib_1.h
-  cname: '@another_typedef_enum_e'
+  cname: enum @another_typedef_enum_e
   module: Example
   identifier: Another_typedef_enum_e
   instances:
@@ -76,7 +76,7 @@ types:
   - Show
   - Storable
 - headers: distilled_lib_1.h
-  cname: '@another_typedef_struct_t'
+  cname: struct @another_typedef_struct_t
   module: Example
   identifier: Another_typedef_struct_t
   instances:
diff --git a/hs-bindgen/fixtures/doxygen_docs.bindingspec.yaml b/hs-bindgen/fixtures/doxygen_docs.bindingspec.yaml
@@ -73,37 +73,37 @@ types:
   - Real
   - Storable
 - headers: doxygen_docs.h
-  cname: '@bitfield_t'
+  cname: struct @bitfield_t
   module: Example
   identifier: Bitfield_t
   instances:
   - Eq
   - Show
   - Storable
 - headers: doxygen_docs.h
-  cname: '@config_t'
+  cname: struct @config_t
   module: Example
   identifier: Config_t
   instances:
   - Eq
   - Show
   - Storable
 - headers: doxygen_docs.h
-  cname: '@data_union_t'
+  cname: union @data_union_t
   module: Example
   identifier: Data_union_t
   instances:
   - Storable
 - headers: doxygen_docs.h
-  cname: '@data_union_t_as_parts'
+  cname: struct @data_union_t_as_parts
   module: Example
   identifier: Data_union_t_as_parts
   instances:
   - Eq
   - Show
   - Storable
 - headers: doxygen_docs.h
-  cname: '@status_code_t'
+  cname: enum @status_code_t
   module: Example
   identifier: Status_code_t
   instances:
diff --git a/hs-bindgen/fixtures/enum_cpp_syntax.bindingspec.yaml b/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:
diff --git a/hs-bindgen/fixtures/enums.bindingspec.yaml b/hs-bindgen/fixtures/enums.bindingspec.yaml
@@ -83,7 +83,7 @@ types:
   - Show
   - Storable
 - headers: enums.h
-  cname: '@enumA'
+  cname: enum @enumA
   module: Example
   identifier: EnumA
   instances:
diff --git a/hs-bindgen/fixtures/flam.bindingspec.yaml b/hs-bindgen/fixtures/flam.bindingspec.yaml
@@ -35,7 +35,7 @@ types:
   - Show
   - Storable
 - headers: flam.h
-  cname: '@foo_bar'
+  cname: struct @foo_bar
   module: Example
   identifier: Foo_bar
   instances:
diff --git a/hs-bindgen/fixtures/fun_attributes.bindingspec.yaml b/hs-bindgen/fixtures/fun_attributes.bindingspec.yaml
@@ -21,7 +21,7 @@ types:
   - Real
   - Storable
 - headers: fun_attributes.h
-  cname: '@FILE'
+  cname: struct @FILE
   module: Example
   identifier: FILE
   instances:
diff --git a/hs-bindgen/fixtures/globals.bindingspec.yaml b/hs-bindgen/fixtures/globals.bindingspec.yaml
@@ -52,23 +52,23 @@ types:
   - Show
   - Storable
 - headers: globals.h
-  cname: '@struct1_t'
+  cname: struct @struct1_t
   module: Example
   identifier: Struct1_t
   instances:
   - Eq
   - Show
   - Storable
 - headers: globals.h
-  cname: '@struct2_t'
+  cname: struct @struct2_t
   module: Example
   identifier: Struct2_t
   instances:
   - Eq
   - Show
   - Storable
 - headers: globals.h
-  cname: '@version_t'
+  cname: struct @version_t
   module: Example
   identifier: Version_t
   instances:
diff --git a/hs-bindgen/fixtures/hsb_complex_test.bindingspec.yaml b/hs-bindgen/fixtures/hsb_complex_test.bindingspec.yaml
@@ -3,7 +3,7 @@ version:
   binding_specification: '1.0'
 types:
 - headers: hsb_complex_test.h
-  cname: complex_object_t
+  cname: struct @complex_object_t
   module: Example
   identifier: Complex_object_t
   instances:
diff --git a/hs-bindgen/fixtures/macro_in_fundecl_vs_typedef.bindingspec.yaml b/hs-bindgen/fixtures/macro_in_fundecl_vs_typedef.bindingspec.yaml
@@ -71,7 +71,7 @@ types:
   - Show
   - Storable
 - headers: macro_in_fundecl_vs_typedef.h
-  cname: '@struct2'
+  cname: struct @struct2
   module: Example
   identifier: Struct2
   instances:
diff --git a/hs-bindgen/fixtures/macro_typedef_struct.bindingspec.yaml b/hs-bindgen/fixtures/macro_typedef_struct.bindingspec.yaml
@@ -21,7 +21,7 @@ types:
   - Real
   - Storable
 - headers: macro_typedef_struct.h
-  cname: '@bar'
+  cname: struct @bar
   module: Example
   identifier: Bar
   instances:
diff --git a/hs-bindgen/fixtures/named_vs_anon.bindingspec.yaml b/hs-bindgen/fixtures/named_vs_anon.bindingspec.yaml
@@ -83,47 +83,47 @@ types:
   - Show
   - Storable
 - headers: named_vs_anon.h
-  cname: '@f'
+  cname: struct @f
   module: Example
   identifier: F
   instances:
   - Eq
   - Show
   - Storable
 - headers: named_vs_anon.h
-  cname: '@g'
+  cname: struct @g
   module: Example
   identifier: G
   instances:
   - Eq
   - Show
   - Storable
 - headers: named_vs_anon.h
-  cname: '@h'
+  cname: struct @h
   module: Example
   identifier: H
   instances:
   - Eq
   - Show
   - Storable
 - headers: named_vs_anon.h
-  cname: '@typedef1'
+  cname: struct @typedef1
   module: Example
   identifier: Typedef1
   instances:
   - Eq
   - Show
   - Storable
 - headers: named_vs_anon.h
-  cname: '@typedef2'
+  cname: struct @typedef2
   module: Example
   identifier: Typedef2
   instances:
   - Eq
   - Show
   - Storable
 - headers: named_vs_anon.h
-  cname: '@typedef3'
+  cname: struct @typedef3
   module: Example
   identifier: Typedef3
   instances:
diff --git a/hs-bindgen/fixtures/nested_enums.bindingspec.yaml b/hs-bindgen/fixtures/nested_enums.bindingspec.yaml
@@ -29,7 +29,7 @@ types:
   - Show
   - Storable
 - headers: nested_enums.h
-  cname: '@exB_fieldB1'
+  cname: enum @exB_fieldB1
   module: Example
   identifier: ExB_fieldB1
   instances:
diff --git a/hs-bindgen/fixtures/nested_types.bindingspec.yaml b/hs-bindgen/fixtures/nested_types.bindingspec.yaml
@@ -43,7 +43,7 @@ types:
   - Show
   - Storable
 - headers: nested_types.h
-  cname: '@ex3_ex3_struct'
+  cname: struct @ex3_ex3_struct
   module: Example
   identifier: Ex3_ex3_struct
   instances:
diff --git a/hs-bindgen/fixtures/nested_unions.bindingspec.yaml b/hs-bindgen/fixtures/nested_unions.bindingspec.yaml
@@ -21,7 +21,7 @@ types:
   instances:
   - Storable
 - headers: nested_unions.h
-  cname: '@exB_fieldB1'
+  cname: union @exB_fieldB1
   module: Example
   identifier: ExB_fieldB1
   instances:
diff --git a/hs-bindgen/fixtures/simple_structs.bindingspec.yaml b/hs-bindgen/fixtures/simple_structs.bindingspec.yaml
@@ -61,23 +61,23 @@ types:
   - Show
   - Storable
 - headers: simple_structs.h
-  cname: '@S3_t'
+  cname: struct @S3_t
   module: Example
   identifier: S3_t
   instances:
   - Eq
   - Show
   - Storable
 - headers: simple_structs.h
-  cname: '@S7a_Deref'
+  cname: struct @S7a_Deref
   module: Example
   identifier: S7a_Deref
   instances:
   - Eq
   - Show
   - Storable
 - headers: simple_structs.h
-  cname: '@S7b_Deref'
+  cname: struct @S7b_Deref
   module: Example
   identifier: S7b_Deref
   instances:
diff --git a/hs-bindgen/fixtures/spec_examples.bindingspec.yaml b/hs-bindgen/fixtures/spec_examples.bindingspec.yaml
@@ -77,7 +77,7 @@ types:
   - Real
   - Storable
 - headers: spec_examples.h
-  cname: '@cint16_T'
+  cname: struct @cint16_T
   module: Example
   identifier: Cint16_T
   instances:
diff --git a/hs-bindgen/fixtures/type_attributes.bindingspec.yaml b/hs-bindgen/fixtures/type_attributes.bindingspec.yaml
@@ -93,7 +93,7 @@ types:
   module: Example
   identifier: Wait
 - headers: type_attributes.h
-  cname: '@wait_status_ptr_t'
+  cname: union @wait_status_ptr_t
   module: Example
   identifier: Wait_status_ptr_t
   instances:
diff --git a/hs-bindgen/fixtures/unions.bindingspec.yaml b/hs-bindgen/fixtures/unions.bindingspec.yaml
@@ -49,15 +49,15 @@ types:
   instances:
   - Storable
 - headers: unions.h
-  cname: '@AnonA_polar'
+  cname: struct @AnonA_polar
   module: Example
   identifier: AnonA_polar
   instances:
   - Eq
   - Show
   - Storable
 - headers: unions.h
-  cname: '@AnonA_xy'
+  cname: struct @AnonA_xy
   module: Example
   identifier: AnonA_xy
   instances:
diff --git a/hs-bindgen/fixtures/vector.bindingspec.yaml b/hs-bindgen/fixtures/vector.bindingspec.yaml
@@ -3,7 +3,7 @@ version:
   binding_specification: '1.0'
 types:
 - headers: vector.h
-  cname: '@vector'
+  cname: struct @vector
   module: Example
   identifier: Vector
   instances:
diff --git a/hs-bindgen/src-internal/HsBindgen/BindingSpec/Gen.hs b/hs-bindgen/src-internal/HsBindgen/BindingSpec/Gen.hs
@@ -164,7 +164,11 @@ getNewtypeSpec hsModuleName hsNewtype =
 getCQualName :: C.DeclInfo -> C.NameKind -> C.QualName
 getCQualName declInfo cNameKind = case C.declOrigin declInfo of
     C.NameOriginInSource              -> C.QualName cName cNameKind
-    C.NameOriginGenerated{}           -> C.QualNameAnon cName
+    C.NameOriginGenerated{}           -> C.QualNameAnon cName $
+      case cNameKind of
+        C.NameKindTagged tagKind -> tagKind
+        -- TODO Refactor C AST IDs (#1146)
+        C.NameKindOrdinary -> panicPure "getCQualName namespace mismatch"
     C.NameOriginRenamedFrom fromCName -> C.QualName fromCName cNameKind
     C.NameOriginBuiltin               -> C.QualName cName C.NameKindOrdinary
   where
diff --git a/hs-bindgen/src-internal/HsBindgen/Frontend/Naming.hs b/hs-bindgen/src-internal/HsBindgen/Frontend/Naming.hs
diff --git a/hs-bindgen/src-internal/HsBindgen/Frontend/Pass/MangleNames.hs b/hs-bindgen/src-internal/HsBindgen/Frontend/Pass/MangleNames.hs
