From e2e3d5c3bf7c07fcbf89c0c69d04273aa20b0d2f Mon Sep 17 00:00:00 2001
From: Patrick Stevens <3138005+Smaug123@users.noreply.github.com>
Date: Sat, 23 Aug 2025 18:41:12 +0100
Subject: [PATCH] Tidy up a bit (#108)

---
 WoofWare.PawPrint.Domain/Assembly.fs                     | 5 ++---
 WoofWare.PawPrint.Domain/ConcreteType.fs                 | 1 -
 WoofWare.PawPrint.Domain/TypeInfo.fs                     | 4 ++--
 WoofWare.PawPrint.Domain/WoofWare.PawPrint.Domain.fsproj | 1 +
 WoofWare.PawPrint/IlMachineState.fs                      | 2 +-
 WoofWare.PawPrint/UnaryMetadataIlOp.fs                   | 4 ++--
 WoofWare.PawPrint/UnaryStringTokenIlOp.fs                | 2 +-
 WoofWare.PawPrint/WoofWare.PawPrint.fsproj               | 1 +
 8 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/WoofWare.PawPrint.Domain/Assembly.fs b/WoofWare.PawPrint.Domain/Assembly.fs
index 4104be6..ea162d0 100644
--- a/WoofWare.PawPrint.Domain/Assembly.fs
+++ b/WoofWare.PawPrint.Domain/Assembly.fs
@@ -463,8 +463,7 @@ module Assembly =
                 match targetType with
                 | [ t ] ->
                     let t =
-                        t
-                        |> TypeInfo.mapGeneric (fun _ (param, md) -> genericArgs.[param.SequenceNumber])
+                        t |> TypeInfo.mapGeneric (fun (param, md) -> genericArgs.[param.SequenceNumber])
 
                     TypeResolutionResult.Resolved (assy, t)
                 | _ :: _ :: _ -> failwith $"Multiple matching type definitions! {nsPath} {target.Name}"
@@ -490,7 +489,7 @@ module Assembly =
         | Some typeDef ->
             let typeDef =
                 typeDef
-                |> TypeInfo.mapGeneric (fun _ (param, md) -> genericArgs.[param.SequenceNumber])
+                |> TypeInfo.mapGeneric (fun (param, md) -> genericArgs.[param.SequenceNumber])
 
             TypeResolutionResult.Resolved (assy, typeDef)
         | None ->
diff --git a/WoofWare.PawPrint.Domain/ConcreteType.fs b/WoofWare.PawPrint.Domain/ConcreteType.fs
index b104d62..de15920 100644
--- a/WoofWare.PawPrint.Domain/ConcreteType.fs
+++ b/WoofWare.PawPrint.Domain/ConcreteType.fs
@@ -50,7 +50,6 @@ type ConcreteType<'typeGeneric> =
     override this.GetHashCode () : int =
         hash (this._AssemblyName.FullName, this._Definition, this._Generics)
 
-
 [<RequireQualifiedAccess>]
 module ConcreteType =
     let make
diff --git a/WoofWare.PawPrint.Domain/TypeInfo.fs b/WoofWare.PawPrint.Domain/TypeInfo.fs
index bd288d4..cb38c0a 100644
--- a/WoofWare.PawPrint.Domain/TypeInfo.fs
+++ b/WoofWare.PawPrint.Domain/TypeInfo.fs
@@ -189,8 +189,8 @@ module TypeInfo =
             ImplementedInterfaces = t.ImplementedInterfaces
         }
 
-    let mapGeneric<'a, 'b, 'field> (f : int -> 'a -> 'b) (t : TypeInfo<'a, 'field>) : TypeInfo<'b, 'field> =
-        withGenerics (t.Generics |> Seq.mapi f |> ImmutableArray.CreateRange) t
+    let mapGeneric<'a, 'b, 'field> (f : 'a -> 'b) (t : TypeInfo<'a, 'field>) : TypeInfo<'b, 'field> =
+        withGenerics (t.Generics |> ImmutableArray.map f) t
 
     let internal read
         (loggerFactory : ILoggerFactory)
diff --git a/WoofWare.PawPrint.Domain/WoofWare.PawPrint.Domain.fsproj b/WoofWare.PawPrint.Domain/WoofWare.PawPrint.Domain.fsproj
index 812ee2d..24e7102 100644
--- a/WoofWare.PawPrint.Domain/WoofWare.PawPrint.Domain.fsproj
+++ b/WoofWare.PawPrint.Domain/WoofWare.PawPrint.Domain.fsproj
@@ -7,6 +7,7 @@
 
     <ItemGroup>
         <Compile Include="StringToken.fs" />
+        <Compile Include="ImmutableArray.fs" />
         <Compile Include="Tokens.fs" />
         <Compile Include="TypeRef.fs" />
         <Compile Include="IlOp.fs" />
diff --git a/WoofWare.PawPrint/IlMachineState.fs b/WoofWare.PawPrint/IlMachineState.fs
index 7089365..d134a29 100644
--- a/WoofWare.PawPrint/IlMachineState.fs
+++ b/WoofWare.PawPrint/IlMachineState.fs
@@ -378,7 +378,7 @@ module IlMachineState =
 
             let defn =
                 assy.TypeDefs.[defn.Get]
-                |> TypeInfo.mapGeneric (fun _ (param, _) -> typeGenericArgs.[param.SequenceNumber])
+                |> TypeInfo.mapGeneric (fun (param, _) -> typeGenericArgs.[param.SequenceNumber])
 
             state, assy, defn
         | TypeDefn.FromReference (ref, _typeKind) ->
diff --git a/WoofWare.PawPrint/UnaryMetadataIlOp.fs b/WoofWare.PawPrint/UnaryMetadataIlOp.fs
index 5115280..d774180 100644
--- a/WoofWare.PawPrint/UnaryMetadataIlOp.fs
+++ b/WoofWare.PawPrint/UnaryMetadataIlOp.fs
@@ -874,7 +874,7 @@ module internal UnaryMetadataIlOp =
                     state,
                     activeAssy,
                     activeAssy.TypeDefs.[defn]
-                    |> TypeInfo.mapGeneric (fun _ (p, _) -> TypeDefn.GenericTypeParameter p.SequenceNumber)
+                    |> TypeInfo.mapGeneric (fun (p, _) -> TypeDefn.GenericTypeParameter p.SequenceNumber)
                 | MetadataToken.TypeSpecification spec ->
                     let state, assy, ty =
                         IlMachineState.resolveTypeFromSpecConcrete
@@ -938,7 +938,7 @@ module internal UnaryMetadataIlOp =
                     state,
                     activeAssy,
                     activeAssy.TypeDefs.[defn]
-                    |> TypeInfo.mapGeneric (fun _ (p, _) -> TypeDefn.GenericTypeParameter p.SequenceNumber)
+                    |> TypeInfo.mapGeneric (fun (p, _) -> TypeDefn.GenericTypeParameter p.SequenceNumber)
                 | MetadataToken.TypeSpecification spec ->
                     let state, assy, ty =
                         IlMachineState.resolveTypeFromSpecConcrete
diff --git a/WoofWare.PawPrint/UnaryStringTokenIlOp.fs b/WoofWare.PawPrint/UnaryStringTokenIlOp.fs
index 1b164e0..e8cb86f 100644
--- a/WoofWare.PawPrint/UnaryStringTokenIlOp.fs
+++ b/WoofWare.PawPrint/UnaryStringTokenIlOp.fs
@@ -6,7 +6,7 @@ open System.Reflection
 [<CompilationRepresentation(CompilationRepresentationFlags.ModuleSuffix)>]
 module internal UnaryStringTokenIlOp =
     let execute
-        (baseClassTypes : BaseClassTypes<'a>)
+        (baseClassTypes : BaseClassTypes<DumpedAssembly>)
         (op : UnaryStringTokenIlOp)
         (sh : StringToken)
         (state : IlMachineState)
diff --git a/WoofWare.PawPrint/WoofWare.PawPrint.fsproj b/WoofWare.PawPrint/WoofWare.PawPrint.fsproj
index b86ab97..0ae9441 100644
--- a/WoofWare.PawPrint/WoofWare.PawPrint.fsproj
+++ b/WoofWare.PawPrint/WoofWare.PawPrint.fsproj
@@ -7,6 +7,7 @@
 
   <ItemGroup>
     <Compile Include="Tuple.fs" />
+    <Compile Include="ImmutableArray.fs" />
     <Compile Include="Result.fs" />
     <Compile Include="Corelib.fs" />
     <Compile Include="AbstractMachineDomain.fs" />