Skip to content

[codex] Implement PR11.11c user-defined generics #201

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
berkeleynerd merged 5 commits into from
Apr 4, 2026
Merged

[codex] Implement PR11.11c user-defined generics #201

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
764eec4
Implement PR11.11c user-defined generics
Apr 4, 2026
a3cd443
Tighten PR11.11c diagnostics and grammar docs
Apr 4, 2026
d078435
Reject reference-bearing generic actuals
Apr 4, 2026
4b7513b
Address PR11.11c generic review feedback
Apr 4, 2026
94477d5
Expand post-PR11 roadmap
Apr 4, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions compiler/ast_schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,7 @@
"fields": [
{ "name": "is_public", "type": "Boolean", "optional": false },
{ "name": "name", "type": "Identifier", "optional": false },
{ "name": "generic_formals", "type": "Option<List<GenericFormal>>", "optional": true },
{ "name": "discriminant_part", "type": "Option<KnownDiscriminantPart>", "optional": true },
{ "name": "type_definition", "type": "NodeRef<TypeDefinition>", "optional": false },
{ "name": "span", "type": "Span", "optional": false }
Expand Down Expand Up @@ -626,6 +627,7 @@
"source_section": "8.6",
"fields": [
{ "name": "identifier", "type": "Identifier", "optional": false },
{ "name": "generic_arguments", "type": "Option<List<SubtypeIndication | ListTypeSpec | MapTypeSpec | GrowableArrayTypeSpec | TupleTypeSpec | OptionalTypeSpec>>", "optional": true },
{ "name": "span", "type": "Span", "optional": false }
]
},
Expand Down Expand Up @@ -658,10 +660,21 @@
"fields": [
{ "name": "prefix", "type": "NodeRef<Name>", "optional": false },
{ "name": "selector", "type": "Identifier", "optional": false },
{ "name": "generic_arguments", "type": "Option<List<SubtypeIndication | ListTypeSpec | MapTypeSpec | GrowableArrayTypeSpec | TupleTypeSpec | OptionalTypeSpec>>", "optional": true },
{ "name": "resolved_kind", "type": "Option<SelectedComponentKind>", "optional": true, "note": "Populated during semantic analysis: RecordField, Attribute, PackageMember, ImplicitDereference. The parser creates SelectedComponent for all X.Y forms; semantic analysis classifies each case per the resolution rule in spec/02-restrictions.md section 2.4.1." },
{ "name": "span", "type": "Span", "optional": false }
]
},
{
"node_type": "GenericFormal",
"production": "generic_formal",
"source_section": "8.8",
"fields": [
{ "name": "name", "type": "Identifier", "optional": false },
{ "name": "constraint_name", "type": "Option<Name>", "optional": true },
{ "name": "span", "type": "Span", "optional": false }
]
},
{
"node_type": "TypeConversion",
"production": "type_conversion",
Expand Down Expand Up @@ -1226,6 +1239,7 @@
"source_section": "8.8",
"fields": [
{ "name": "name", "type": "Identifier", "optional": false },
{ "name": "generic_formals", "type": "Option<List<GenericFormal>>", "optional": true },
{ "name": "receiver", "type": "Option<ParameterSpecification>", "optional": true },
{ "name": "formal_part", "type": "Option<FormalPart>", "optional": true },
{ "name": "span", "type": "Span", "optional": false }
Expand All @@ -1237,6 +1251,7 @@
"source_section": "8.8",
"fields": [
{ "name": "name", "type": "Identifier", "optional": false },
{ "name": "generic_formals", "type": "Option<List<GenericFormal>>", "optional": true },
{ "name": "receiver", "type": "Option<ParameterSpecification>", "optional": true },
{ "name": "formal_part", "type": "Option<FormalPart>", "optional": true },
{ "name": "return_type", "type": "NodeRef<SubtypeIndication | ListTypeSpec | MapTypeSpec | GrowableArrayTypeSpec | TupleTypeSpec | OptionalTypeSpec>", "optional": false },
Expand Down
97 changes: 73 additions & 24 deletions compiler_impl/src/safe_frontend-ada_emit.adb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6817,7 +6817,8 @@ package body Safe_Frontend.Ada_Emit is
end Add_From_Statements;
begin
for Item of Unit.Types loop
if Has_Text (Item.Name)
if Item.Generic_Formals.Is_Empty
and then Has_Text (Item.Name)
and then not Contains_Name (Seen, FT.To_String (Item.Name))
then
Seen.Append (Item.Name);
Expand All @@ -6832,7 +6833,9 @@ package body Safe_Frontend.Ada_Emit is
end loop;

for Item of Unit.Types loop
Add_From_Info (Item);
if Item.Generic_Formals.Is_Empty then
Add_From_Info (Item);
end if;
end loop;
for Item of Unit.Objects loop
Add_From_Info (Item.Type_Info);
Expand Down Expand Up @@ -6982,7 +6985,9 @@ package body Safe_Frontend.Ada_Emit is
end Add_From_Statements;
begin
for Item of Unit.Types loop
Add_From_Info (Item);
if Item.Generic_Formals.Is_Empty then
Add_From_Info (Item);
end if;
end loop;
for Item of Unit.Objects loop
Add_From_Info (Item.Type_Info);
Expand Down Expand Up @@ -7095,7 +7100,9 @@ package body Safe_Frontend.Ada_Emit is
end Add_From_Statements;
begin
for Item of Unit.Types loop
Add_From_Info (Item);
if Item.Generic_Formals.Is_Empty then
Add_From_Info (Item);
end if;
end loop;
for Item of Unit.Objects loop
Add_From_Info (Item.Type_Info);
Expand Down Expand Up @@ -18668,7 +18675,9 @@ package body Safe_Frontend.Ada_Emit is
end if;

for Subprogram of Unit.Subprograms loop
if not Subprogram.Is_Interface_Template then
if not Subprogram.Is_Interface_Template
and then not Subprogram.Is_Generic_Template
then
declare
Name_Text : constant String := FT.To_String (Subprogram.Name);
begin
Expand Down Expand Up @@ -19053,7 +19062,9 @@ package body Safe_Frontend.Ada_Emit is
end if;

for Type_Item of Unit.Types loop
if FT.To_String (Type_Item.Kind) /= "interface" then
if Type_Item.Generic_Formals.Is_Empty
and then FT.To_String (Type_Item.Kind) /= "interface"
then
Append_Line (Spec_Inner, Render_Type_Decl (Unit, Document, Type_Item, State), 1);
if FT.To_String (Type_Item.Kind) = "record" then
Append_Line (Spec_Inner);
Expand Down Expand Up @@ -19143,25 +19154,58 @@ package body Safe_Frontend.Ada_Emit is

if not Unit.Subprograms.Is_Empty then
for Subprogram of Unit.Subprograms loop
if not Subprogram.Is_Interface_Template then
if not Subprogram.Is_Interface_Template
and then not Subprogram.Is_Generic_Template
then
declare
Expression_Image : constant String :=
Render_Expression_Function_Image
(Unit, Document, Subprogram, State);
(if Subprogram.Force_Body_Emission
then ""
else
Render_Expression_Function_Image
(Unit, Document, Subprogram, State));
begin
Append_Line
(Spec_Inner,
Render_Ada_Subprogram_Keyword (Subprogram)
& " "
& FT.To_String (Subprogram.Name)
& Render_Subprogram_Params (Unit, Document, Subprogram.Params)
& Render_Subprogram_Return (Unit, Document, Subprogram)
& (if Expression_Image'Length > 0
then " is (" & Expression_Image & ")"
else "")
& Render_Subprogram_Aspects (Unit, Document, Subprogram, Bronze, State)
& ";",
1);
if Expression_Image'Length = 0 then
Append_Line
(Spec_Inner,
Render_Ada_Subprogram_Keyword (Subprogram)
& " "
& FT.To_String (Subprogram.Name)
& Render_Subprogram_Params (Unit, Document, Subprogram.Params)
& Render_Subprogram_Return (Unit, Document, Subprogram)
& Render_Subprogram_Aspects (Unit, Document, Subprogram, Bronze, State)
& ";",
1);
end if;
end;
end if;
end loop;

for Subprogram of Unit.Subprograms loop
if not Subprogram.Is_Interface_Template
and then not Subprogram.Is_Generic_Template
then
declare
Expression_Image : constant String :=
(if Subprogram.Force_Body_Emission
then ""
else
Render_Expression_Function_Image
(Unit, Document, Subprogram, State));
begin
if Expression_Image'Length > 0 then
Append_Line
(Spec_Inner,
Render_Ada_Subprogram_Keyword (Subprogram)
& " "
& FT.To_String (Subprogram.Name)
& Render_Subprogram_Params (Unit, Document, Subprogram.Params)
& Render_Subprogram_Return (Unit, Document, Subprogram)
& " is (" & Expression_Image & ")"
& Render_Subprogram_Aspects (Unit, Document, Subprogram, Bronze, State)
& ";",
1);
end if;
end;
end if;
end loop;
Expand Down Expand Up @@ -19250,7 +19294,9 @@ package body Safe_Frontend.Ada_Emit is
Append_Line (Body_Inner);

for Type_Item of Unit.Types loop
if FT.To_String (Type_Item.Kind) /= "interface" then
if Type_Item.Generic_Formals.Is_Empty
and then FT.To_String (Type_Item.Kind) /= "interface"
then
Render_Growable_Array_Helper_Body
(Body_Inner, Unit, Document, Type_Item, State);
end if;
Expand Down Expand Up @@ -19300,7 +19346,10 @@ package body Safe_Frontend.Ada_Emit is

for Subprogram of Unit.Subprograms loop
if not Subprogram.Is_Interface_Template
and then Render_Expression_Function_Image (Unit, Document, Subprogram, State)'Length = 0
and then not Subprogram.Is_Generic_Template
and then
(Subprogram.Force_Body_Emission
or else Render_Expression_Function_Image (Unit, Document, Subprogram, State)'Length = 0)
then
Render_Subprogram_Body (Body_Inner, Unit, Document, Subprogram, State);
end if;
Expand Down
Loading
Loading