EEEEE

Draco-lang · Nov 12, 2024 · 9b5951c · 9b5951c
1 parent 2dbd54c
commit 9b5951c
Show file tree

Hide file tree

Showing 7 changed files with 34 additions and 1 deletion.
diff --git a/src/Draco.Compiler/Internal/Symbols/Generic/FieldInstanceSymbol.cs b/src/Draco.Compiler/Internal/Symbols/Generic/FieldInstanceSymbol.cs
@@ -1,3 +1,5 @@
+using System.Collections.Generic;
+using System.Linq;
 using System.Threading;
 using Draco.Compiler.Api.Syntax;
 
@@ -28,4 +30,8 @@ internal sealed class FieldInstanceSymbol(
 
     private TypeSymbol BuildType() =>
         this.GenericDefinition.Type.GenericInstantiate(this.GenericDefinition.Type.ContainingSymbol, this.Context);
+
+    protected internal override IEnumerable<Symbol> GetAdditionalSymbols() => this.GenericDefinition
+        .GetAdditionalSymbols()
+        .Select(s => s.GenericInstantiate(this, this.Context));
 }
diff --git a/src/Draco.Compiler/Internal/Symbols/Generic/FunctionInstanceSymbol.cs b/src/Draco.Compiler/Internal/Symbols/Generic/FunctionInstanceSymbol.cs
@@ -1,3 +1,4 @@
+using System.Collections.Generic;
 using System.Collections.Immutable;
 using System.Linq;
 using System.Text;
@@ -137,4 +138,8 @@ private ImmutableArray<ParameterSymbol> BuildParameters() => this.GenericDefinit
 
     private TypeSymbol BuildReturnType() =>
         this.GenericDefinition.ReturnType.GenericInstantiate(this.GenericDefinition.ReturnType.ContainingSymbol, this.Context);
+
+    protected internal override IEnumerable<Symbol> GetAdditionalSymbols() => this.GenericDefinition
+        .GetAdditionalSymbols()
+        .Select(s => s.GenericInstantiate(this, this.Context));
 }
diff --git a/src/Draco.Compiler/Internal/Symbols/Generic/ParameterInstanceSymbol.cs b/src/Draco.Compiler/Internal/Symbols/Generic/ParameterInstanceSymbol.cs
@@ -1,3 +1,5 @@
+using System.Collections.Generic;
+using System.Linq;
 using System.Threading;
 using Draco.Compiler.Api.Syntax;
 
@@ -26,4 +28,8 @@ internal sealed class ParameterInstanceSymbol(
 
     private TypeSymbol BuildType() =>
         this.GenericDefinition.Type.GenericInstantiate(this.GenericDefinition.Type.ContainingSymbol, this.Context);
+
+    protected internal override IEnumerable<Symbol> GetAdditionalSymbols() => this.GenericDefinition
+        .GetAdditionalSymbols()
+        .Select(s => s.GenericInstantiate(this, this.Context));
 }
diff --git a/src/Draco.Compiler/Internal/Symbols/Generic/PropertyAccessorInstanceSymbol.cs b/src/Draco.Compiler/Internal/Symbols/Generic/PropertyAccessorInstanceSymbol.cs
@@ -1,3 +1,5 @@
+using System.Collections.Generic;
+using System.Linq;
 using Draco.Compiler.Api.Syntax;
 
 namespace Draco.Compiler.Internal.Symbols.Generic;
@@ -17,4 +19,8 @@ internal sealed class PropertyAccessorInstanceSymbol(
     public PropertySymbol Property { get; } = property;
     public override Api.Semantics.Visibility Visibility => this.GenericDefinition.Visibility;
     public override SyntaxNode? DeclaringSyntax => this.GenericDefinition.DeclaringSyntax;
+
+    protected internal override IEnumerable<Symbol> GetAdditionalSymbols() => this.GenericDefinition
+        .GetAdditionalSymbols()
+        .Select(s => s.GenericInstantiate(this, this.Context));
 }
diff --git a/src/Draco.Compiler/Internal/Symbols/Generic/PropertyInstanceSymbol.cs b/src/Draco.Compiler/Internal/Symbols/Generic/PropertyInstanceSymbol.cs
@@ -1,3 +1,5 @@
+using System.Collections.Generic;
+using System.Linq;
 using System.Threading;
 using Draco.Compiler.Api.Syntax;
 using Draco.Compiler.Internal.Utilities;
@@ -44,4 +46,8 @@ private TypeSymbol BuildType() =>
     private FunctionSymbol? BuildSetter() => this.GenericDefinition.Setter is not null
         ? new PropertyAccessorInstanceSymbol(this.ContainingSymbol, this.GenericDefinition.Setter, this.Context, this)
         : null;
+
+    protected internal override IEnumerable<Symbol> GetAdditionalSymbols() => this.GenericDefinition
+        .GetAdditionalSymbols()
+        .Select(s => s.GenericInstantiate(this, this.Context));
 }
diff --git a/src/Draco.Compiler/Internal/Symbols/Generic/TypeInstanceSymbol.cs b/src/Draco.Compiler/Internal/Symbols/Generic/TypeInstanceSymbol.cs
@@ -141,4 +141,8 @@ private void BuildGenerics()
     private ImmutableArray<Symbol> BuildDefinedMembers() => this.GenericDefinition.DefinedMembers
         .Select(m => m.GenericInstantiate(this, this.Context))
         .ToImmutableArray();
+
+    protected internal override IEnumerable<Symbol> GetAdditionalSymbols() => this.GenericDefinition
+        .GetAdditionalSymbols()
+        .Select(s => s.GenericInstantiate(this, this.Context));
 }
diff --git a/src/Draco.Compiler/Internal/Symbols/TypeSymbol.cs b/src/Draco.Compiler/Internal/Symbols/TypeSymbol.cs
@@ -215,7 +215,7 @@ public override TypeSymbol GenericInstantiate(Symbol? containingSymbol, GenericC
 
     public override abstract string ToString();
 
-    protected internal override sealed IEnumerable<Symbol> GetAdditionalSymbols()
+    protected internal override IEnumerable<Symbol> GetAdditionalSymbols()
     {
         if (this.IsAbstract) yield break;
         // For non-abstract types we provide constructor functions