fix: Rename

Hosihikari · May 5, 2024 · 8e699e5 · 8e699e5
1 parent b43b09f
commit 8e699e5
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 50 deletions.
diff --git a/src/Unmanaged/CppTypeSystem.cs b/src/Unmanaged/CppTypeSystem.cs
@@ -52,10 +52,10 @@ public static T As<T>(this ICppInstanceNonGeneric @this, bool releaseSrc = false
             return T.ConstructInstance(@this.Pointer, false, true);
         }
 
-        T temp = T.ConstructInstance(@this.Pointer, @this.IsOwner, @this.IsTempStackValue);
+        T temp = T.ConstructInstance(@this.Pointer, @this.OwnsInstance, @this.OwnsMemory);
         @this.Pointer = 0;
-        @this.IsOwner = false;
-        @this.IsTempStackValue = false;
+        @this.OwnsInstance = false;
+        @this.OwnsMemory = false;
         @this.Dispose();
         return temp;
     }
@@ -106,7 +106,7 @@ static INativeVirtualMethodOverrideProvider()
             list.Add((overrideAttr.VirtualMethodIndex, method.MethodHandle.GetFunctionPointer()));
         }
 
-        virtFptrs = list.ToArray();
+        virtFptrs = [.. list];
     }
 
     static VTableHandle? SetupVtable(ICppInstanceNonGeneric ins)

diff --git a/src/Unmanaged/ICppInstance.cs b/src/Unmanaged/ICppInstance.cs
@@ -10,12 +10,12 @@ public interface ICppInstanceNonGeneric : IDisposable
     /// <summary>
     ///     noexcept
     /// </summary>
-    public bool IsOwner { get; set; }
+    public bool OwnsInstance { get; set; }
 
     /// <summary>
     ///     noexcept
     /// </summary>
-    public bool IsTempStackValue { get; set; }
+    public bool OwnsMemory { get; set; }
 
     /// <summary>
     ///     noexcept

diff --git a/src/Unmanaged/Result.cs b/src/Unmanaged/Result.cs
diff --git a/src/Unmanaged/STL/StdVector.cs b/src/Unmanaged/STL/StdVector.cs
@@ -51,7 +51,7 @@ static StdVector()
     public StdVector(nint ptr, bool isOwner = false, bool isTempStackValue = true)
     {
         _pointer = (StdVector*)ptr.ToPointer();
-        IsOwner = isOwner;
+        OwnsInstance = isOwner;
     }
 
     public StdVector(StdVector<T> vec)
@@ -68,8 +68,8 @@ public StdVector(StdVector<T> vec)
         Unsafe.CopyBlock(First, vec.First, (uint)size * (uint)sizeof(T));
         Last = First + size;
         End = Last + vec.Capacity();
-        IsOwner = true;
-        IsTempStackValue = false;
+        OwnsInstance = true;
+        OwnsMemory = false;
     }
 
     // public StdVector(MoveHandle<StdVector<T>> vec)
@@ -93,21 +93,21 @@ public StdVector(StdVector<T> vec)
     public StdVector(nint pointer)
     {
         _pointer = (StdVector*)pointer.ToPointer();
-        IsOwner = false;
-        IsTempStackValue = true;
+        OwnsInstance = false;
+        OwnsMemory = true;
     }
 
     public StdVector(void* pointer)
     {
         _pointer = (StdVector*)pointer;
-        IsOwner = false;
-        IsTempStackValue = true;
+        OwnsInstance = false;
+        OwnsMemory = true;
     }
 
     public StdVector()
     {
         _pointer = (StdVector*)Marshal.AllocHGlobal(sizeof(StdVector)).ToPointer();
-        IsOwner = true;
+        OwnsInstance = true;
         Unsafe.InitBlock(_pointer, 0, (uint)sizeof(StdVector));
     }
 
@@ -148,8 +148,8 @@ public static StdVector<T> ConstructInstanceByCopy(StdVector<T> right)
     }
 
     public static ulong ClassSize => 24ul;
-    public bool IsOwner { get; set; }
-    public bool IsTempStackValue { get; set; }
+    public bool OwnsInstance { get; set; }
+    public bool OwnsMemory { get; set; }
 
     public nint Pointer
     {
@@ -226,7 +226,7 @@ private void Dispose(bool disposing)
             return;
         }
 
-        if (IsOwner)
+        if (OwnsInstance)
         {
             Destruct();
             LibNative.operator_delete(this);

diff --git a/src/Unmanaged/UnexploredType.cs b/src/Unmanaged/UnexploredType.cs
@@ -0,0 +1,6 @@
+namespace Hosihikari.NativeInterop.Unmanaged;
+
+public struct UnexploredType<T> where T : class, ICppInstance<T>
+{
+    static UnexploredType() => throw new InvalidOperationException();
+}