Migrated more types to auto generate readonly.

MeltyPlayer · Apr 17, 2024 · 1d8a821 · 1d8a821
1 parent 43ce2b4
commit 1d8a821
Show file tree

Hide file tree

Showing 28 changed files with 72 additions and 68 deletions.
diff --git a/FinModelUtility/Fin/Fin/Fin.csproj b/FinModelUtility/Fin/Fin/Fin.csproj
@@ -41,6 +41,6 @@
     <PackageReference Include="SubstreamSharp" Version="1.0.3" />
     <PackageReference Include="System.Drawing.Common" Version="7.0.0" />
     <PackageReference Include="System.IO.Abstractions" Version="19.2.51" />
-    <PackageReference Include="schema" Version="0.4.4" />
+    <PackageReference Include="schema" Version="0.4.7" />
   </ItemGroup>
 </Project>
diff --git a/FinModelUtility/Fin/Fin/src/data/Grid.cs b/FinModelUtility/Fin/Fin/src/data/Grid.cs
@@ -5,16 +5,14 @@
 
 using fin.util.asserts;
 
+using schema.readOnly;
+
 namespace fin.data {
-  public interface IReadOnlyGrid<out T> : IEnumerable<T> {
+  [GenerateReadOnly]
+  public partial interface IGrid<T> : IEnumerable<T> {
     int Width { get; }
     int Height { get; }
-
-    T this[int x, int y] { get; }
-  }
-
-  public interface IGrid<T> : IReadOnlyGrid<T> {
-    new T this[int x, int y] { get; set; }
+    T this[int x, int y] { get; set; }
   }
 
   public class Grid<T> : IGrid<T> {
@@ -23,7 +21,7 @@ public class Grid<T> : IGrid<T> {
     public Grid(int width, int height, T defaultValue = default!) {
       this.Width = width;
       this.Height = height;
-      
+
       this.impl_ = new T[width * height];
       for (var i = 0; i < this.impl_.Count; ++i) {
         this.impl_[i] = defaultValue;
@@ -56,11 +54,13 @@ private int GetIndex_(int x, int y) {
         Asserts.Fail(
             $"Expected ({x}, {y}) to be a valid index in grid of size ({this.Width}, {this.Height}).");
       }
+
       return y * this.Width + x;
     }
 
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     IEnumerator IEnumerable.GetEnumerator() => this.GetEnumerator();
+
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     public IEnumerator<T> GetEnumerator() => this.impl_.GetEnumerator();
   }

diff --git a/FinModelUtility/Fin/Fin/src/data/dictionaries/ListDictionary.cs b/FinModelUtility/Fin/Fin/src/data/dictionaries/ListDictionary.cs
@@ -2,18 +2,20 @@
 using System.Collections.Generic;
 using System.Linq;
 
+using schema.readOnly;
+
 namespace fin.data.dictionaries {
-  public interface IReadOnlyListDictionary<TKey, TValue>
-      : IReadOnlyFinCollection<(TKey Key, IList<TValue> Value)> {
+  [GenerateReadOnly]
+  public partial interface IListDictionary<TKey, TValue>
+      : IFinCollection<(TKey Key, IList<TValue> Value)> {
+    [Const]
     bool HasList(TKey key);
 
     IList<TValue> this[TKey key] { get; }
+
+    [Const]
     bool TryGetList(TKey key, out IList<TValue>? list);
-  }
 
-  public interface IListDictionary<TKey, TValue>
-      : IReadOnlyListDictionary<TKey, TValue>,
-        IFinCollection<(TKey Key, IList<TValue> Value)> {
     void ClearList(TKey key);
     void Add(TKey key, TValue value);
   }

diff --git a/FinModelUtility/Fin/Fin/src/data/dictionaries/SubTypeDictionary.cs b/FinModelUtility/Fin/Fin/src/data/dictionaries/SubTypeDictionary.cs
@@ -3,15 +3,15 @@
 
 using fin.util.asserts;
 
+using schema.readOnly;
+
 namespace fin.data.dictionaries {
-  public interface IReadOnlySubTypeDictionary<TKey, TValue>
-      : IReadOnlyFinCollection<(TKey Key, TValue Value)> {
+  [GenerateReadOnly]
+  public partial interface ISubTypeDictionary<TKey, TValue>
+      : IFinCollection<(TKey Key, TValue Value)> {
+    [Const]
     TValueSub Get<TValueSub>(TKey key) where TValueSub : TValue;
-  }
 
-  public interface ISubTypeDictionary<TKey, TValue>
-      : IReadOnlySubTypeDictionary<TKey, TValue>,
-        IFinCollection<(TKey Key, TValue Value)> {
     void Set<TValueSub>(TKey key, TValueSub value) where TValueSub : TValue;
   }
 

diff --git a/FinModelUtility/Fin/Fin/src/data/indexable/IndexableDictionary.cs b/FinModelUtility/Fin/Fin/src/data/indexable/IndexableDictionary.cs
@@ -4,23 +4,23 @@
 using System.Linq;
 using System.Runtime.CompilerServices;
 
+using schema.readOnly;
+
 namespace fin.data.indexable {
-  public interface IReadOnlyIndexableDictionary<TIndexable, TValue>
+  [GenerateReadOnly]
+  public partial interface IIndexableDictionary<TIndexable, TValue>
       : IEnumerable<TValue>
       where TIndexable : IIndexable {
-    TValue this[int index] { get; }
-    TValue this[TIndexable key] { get; }
-
+    [Const]
     bool TryGetValue(int index, out TValue value);
+
+    [Const]
     bool TryGetValue(TIndexable key, out TValue value);
-  }
 
-  public interface IIndexableDictionary<TIndexable, TValue>
-      : IReadOnlyIndexableDictionary<TIndexable, TValue>
-      where TIndexable : IIndexable {
+
     void Clear();
-    new TValue this[int index] { get; set; }
-    new TValue this[TIndexable key] { get; set; }
+    TValue this[int index] { get; set; }
+    TValue this[TIndexable key] { get; set; }
   }
 
   public class IndexableDictionary<TIndexable, TValue>(int capacity)

diff --git a/FinModelUtility/Fin/Fin/src/data/indexable/IndexableSet.cs b/FinModelUtility/Fin/Fin/src/data/indexable/IndexableSet.cs
@@ -1,18 +1,17 @@
-using System.Collections;
-using System.Collections.Generic;
+using fin.data.sets;
 
-using fin.data.sets;
+using schema.readOnly;
 
 namespace fin.data.indexable {
-  public interface IReadOnlyIndexableSet<TIndexable> : IFinSet<TIndexable>
+  [GenerateReadOnly]
+  public partial interface IIndexableSet<TIndexable> : IFinSet<TIndexable>
       where TIndexable : IIndexable {
+    [Const]
     bool Contains(int index);
+
     TIndexable this[int index] { get; }
+
+    [Const]
     bool TryGetValue(int index, out TIndexable value);
   }
-
-  public interface IIndexableSet<TIndexable> :
-      IReadOnlyIndexableSet<TIndexable>,
-      IFinSet<TIndexable>
-      where TIndexable : IIndexable { }
 }
diff --git a/FinModelUtility/Fin/Fin/src/model/IVertexInterfaces.cs b/FinModelUtility/Fin/Fin/src/model/IVertexInterfaces.cs
@@ -46,11 +46,13 @@ public interface ITangentVertex : IReadOnlyTangentVertex, IVertex {
   }
 
 
-  public interface IReadOnlyNormalTangentVertex : IReadOnlyNormalVertex,
-                                                  IReadOnlyTangentVertex { }
+  public interface IReadOnlyNormalTangentVertex
+      : IReadOnlyNormalVertex,
+        IReadOnlyTangentVertex { }
 
-  public interface INormalTangentVertex : IReadOnlyNormalTangentVertex,
-                                          INormalVertex, ITangentVertex { }
+  public interface INormalTangentVertex
+      : IReadOnlyNormalTangentVertex,
+        INormalVertex, ITangentVertex { }
 
 
   public interface IReadOnlySingleColorVertex : IReadOnlyVertex {
@@ -66,12 +68,13 @@ public interface ISingleColorVertex : IReadOnlySingleColorVertex, IVertex {
   }
 
 
-  public interface IReadOnlyMultiColorVertex : IReadOnlyVertex {
+  [GenerateReadOnly]
+  public partial interface IMultiColorVertex : IVertex {
     int ColorCount { get; }
+
+    [Const]
     IColor? GetColor(int colorIndex);
-  }
 
-  public interface IMultiColorVertex : IReadOnlyMultiColorVertex, IVertex {
     void SetColor(int colorIndex, IColor? color);
 
     void SetColorBytes(int colorIndex,

diff --git a/FinModelUtility/Formats/Ast/Ast/Ast.csproj b/FinModelUtility/Formats/Ast/Ast/Ast.csproj
@@ -12,6 +12,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="schema" Version="0.4.4" />
+    <PackageReference Include="schema" Version="0.4.7" />
   </ItemGroup>
 </Project>
diff --git a/FinModelUtility/Formats/Cmb/Cmb/Cmb.csproj b/FinModelUtility/Formats/Cmb/Cmb/Cmb.csproj
@@ -23,7 +23,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="schema" Version="0.4.4" />
+    <PackageReference Include="schema" Version="0.4.7" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/FinModelUtility/Formats/Dat/Dat/Dat.csproj b/FinModelUtility/Formats/Dat/Dat/Dat.csproj
@@ -15,7 +15,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="schema" Version="0.4.4" />
+    <PackageReference Include="schema" Version="0.4.7" />
   </ItemGroup>
 
 </Project>
diff --git a/FinModelUtility/Formats/F3dzex2/F3dzex2.csproj b/FinModelUtility/Formats/F3dzex2/F3dzex2.csproj
@@ -15,7 +15,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="schema" Version="0.4.4" />
+    <PackageReference Include="schema" Version="0.4.7" />
   </ItemGroup>
 
 </Project>
diff --git a/FinModelUtility/Formats/Glo/Glo/Glo.csproj b/FinModelUtility/Formats/Glo/Glo/Glo.csproj
@@ -15,7 +15,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="schema" Version="0.4.4" />
+    <PackageReference Include="schema" Version="0.4.7" />
   </ItemGroup>
 
 </Project>
diff --git a/FinModelUtility/Formats/Granny3d/Granny3d.csproj b/FinModelUtility/Formats/Granny3d/Granny3d.csproj
@@ -13,7 +13,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="schema" Version="0.4.4" />
+    <PackageReference Include="schema" Version="0.4.7" />
   </ItemGroup>
 
 </Project>
diff --git a/FinModelUtility/Formats/Gx/Gx.csproj b/FinModelUtility/Formats/Gx/Gx.csproj
@@ -14,7 +14,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="schema" Version="0.4.4" />
+    <PackageReference Include="schema" Version="0.4.7" />
   </ItemGroup>
 
 </Project>
diff --git a/FinModelUtility/Formats/JSystem/JSystem/JSystem.csproj b/FinModelUtility/Formats/JSystem/JSystem/JSystem.csproj
@@ -60,7 +60,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="schema" Version="0.4.4" />
+    <PackageReference Include="schema" Version="0.4.7" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/FinModelUtility/Formats/Level5/Level5/Level5.csproj b/FinModelUtility/Formats/Level5/Level5/Level5.csproj
@@ -13,7 +13,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="schema" Version="0.4.4" />
+    <PackageReference Include="schema" Version="0.4.7" />
     <PackageReference Include="OpenTK" Version="3.3.3" />
   </ItemGroup>
 </Project>
diff --git a/FinModelUtility/Formats/Mdl/Mdl/Mdl.csproj b/FinModelUtility/Formats/Mdl/Mdl/Mdl.csproj
@@ -8,6 +8,6 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="schema" Version="0.4.4" />
+    <PackageReference Include="schema" Version="0.4.7" />
   </ItemGroup>
 </Project>
diff --git a/FinModelUtility/Formats/Mod/Mod/Mod.csproj b/FinModelUtility/Formats/Mod/Mod/Mod.csproj
@@ -58,7 +58,7 @@
 
   <ItemGroup>
     <PackageReference Include="CommandLineParser" Version="2.9.1" />
-    <PackageReference Include="schema" Version="0.4.4" />
+    <PackageReference Include="schema" Version="0.4.7" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/FinModelUtility/Formats/Modl/Modl/Modl.csproj b/FinModelUtility/Formats/Modl/Modl/Modl.csproj
@@ -16,7 +16,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="schema" Version="0.4.4" />
+    <PackageReference Include="schema" Version="0.4.7" />
   </ItemGroup>
 
 </Project>
diff --git a/FinModelUtility/Formats/Nitro/Nitro/Nitro.csproj b/FinModelUtility/Formats/Nitro/Nitro/Nitro.csproj
@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="schema" Version="0.4.4" />
+    <PackageReference Include="schema" Version="0.4.7" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/FinModelUtility/Formats/Visceral/Visceral/Visceral.csproj b/FinModelUtility/Formats/Visceral/Visceral/Visceral.csproj
@@ -14,7 +14,7 @@
 
   <ItemGroup>
     <PackageReference Include="BCnEncoder.Net" Version="2.1.0" />
-    <PackageReference Include="schema" Version="0.4.4" />
+    <PackageReference Include="schema" Version="0.4.7" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/FinModelUtility/Formats/Xmod/Xmod.csproj b/FinModelUtility/Formats/Xmod/Xmod.csproj
@@ -10,7 +10,7 @@
 
   <ItemGroup>
     <PackageReference Include="BCnEncoder.Net" Version="2.1.0" />
-    <PackageReference Include="schema" Version="0.4.4" />
+    <PackageReference Include="schema" Version="0.4.7" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/FinModelUtility/Games/BanjoKazooie/BanjoKazooie.csproj b/FinModelUtility/Games/BanjoKazooie/BanjoKazooie.csproj
@@ -15,7 +15,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="schema" Version="0.4.4" />
+    <PackageReference Include="schema" Version="0.4.7" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/FinModelUtility/Games/HaloWars/HaloWarsTools/HaloWarsTools.csproj b/FinModelUtility/Games/HaloWars/HaloWarsTools/HaloWarsTools.csproj
@@ -21,7 +21,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.Toolkit.HighPerformance" Version="7.1.2" />
     <PackageReference Include="Microsoft.Win32.Registry" Version="5.0.0" />
-    <PackageReference Include="schema" Version="0.4.4" />
+    <PackageReference Include="schema" Version="0.4.7" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/...Utility/Games/PaperMarioDirectorsCut/PaperMarioDirectorsCut/PaperMarioDirectorsCut.csproj b/...Utility/Games/PaperMarioDirectorsCut/PaperMarioDirectorsCut/PaperMarioDirectorsCut.csproj
@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="schema" Version="0.4.4" />
+    <PackageReference Include="schema" Version="0.4.7" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/FinModelUtility/Games/SuperMario64/SuperMario64/SuperMario64.csproj b/FinModelUtility/Games/SuperMario64/SuperMario64/SuperMario64.csproj
@@ -67,6 +67,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="OpenTK" Version="3.3.3" />
-    <PackageReference Include="schema" Version="0.4.4" />
+    <PackageReference Include="schema" Version="0.4.7" />
   </ItemGroup>
 </Project>
diff --git a/FinModelUtility/Games/TimeSplitters2/TimeSplitters2/TimeSplitters2.csproj b/FinModelUtility/Games/TimeSplitters2/TimeSplitters2/TimeSplitters2.csproj
@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="schema" Version="0.4.4" />
+    <PackageReference Include="schema" Version="0.4.7" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/FinModelUtility/ModelPluginWrappers/ModelPluginWrappers.csproj b/FinModelUtility/ModelPluginWrappers/ModelPluginWrappers.csproj
@@ -18,7 +18,7 @@
 
   <ItemGroup>
     <PackageReference Include="IronPython" Version="3.4.1" />
-    <PackageReference Include="schema" Version="0.4.4" />
+    <PackageReference Include="schema" Version="0.4.7" />
   </ItemGroup>
 
   <ItemGroup>