From 505b85ead546a093a94b157889fbfe83731a55c2 Mon Sep 17 00:00:00 2001 From: Jeroen van Rijn Date: Sun, 2 Nov 2025 07:45:40 +0100 Subject: [PATCH 1/2] Add #subtype using to name canonicalization --- src/name_canonicalization.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/name_canonicalization.cpp b/src/name_canonicalization.cpp index 8bacfabc6..88235484a 100644 --- a/src/name_canonicalization.cpp +++ b/src/name_canonicalization.cpp @@ -756,6 +756,14 @@ gb_internal void write_type_to_canonical_string(TypeWriter *w, Type *type) { if (i > 0) { type_writer_appendc(w, CANONICAL_FIELD_SEPARATOR); } + + if (f->flags & EntityFlags_IsSubtype) { + type_writer_appendc(w, "#subtype"); + } + + if (f->flags & EntityFlag_Using) { + type_writer_appendc(w, "using"); + } type_writer_append(w, f->token.string.text, f->token.string.len); type_writer_appendc(w, CANONICAL_TYPE_SEPARATOR); write_type_to_canonical_string(w, f->type); From b6181a768e368536819621b145ceaa5bb05d60ac Mon Sep 17 00:00:00 2001 From: Jeroen van Rijn Date: Sun, 2 Nov 2025 13:28:34 +0100 Subject: [PATCH 2/2] Add space --- src/name_canonicalization.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/name_canonicalization.cpp b/src/name_canonicalization.cpp index 88235484a..edadde35e 100644 --- a/src/name_canonicalization.cpp +++ b/src/name_canonicalization.cpp @@ -758,11 +758,11 @@ gb_internal void write_type_to_canonical_string(TypeWriter *w, Type *type) { } if (f->flags & EntityFlags_IsSubtype) { - type_writer_appendc(w, "#subtype"); + type_writer_appendc(w, "#subtype "); } if (f->flags & EntityFlag_Using) { - type_writer_appendc(w, "using"); + type_writer_appendc(w, "using "); } type_writer_append(w, f->token.string.text, f->token.string.len); type_writer_appendc(w, CANONICAL_TYPE_SEPARATOR);