make some files follow nullability

Angel-foxxo · Angel-foxxo · commit b4adf7cc56c2 · 2025-05-22T02:33:35.000+02:00
diff --git a/Arrays.cs b/Arrays.cs
@@ -24,17 +24,17 @@ public DebugView(Array<T> arr)
 
         protected List<T> Inner;
 
-        public virtual AttributeList Owner
+        public virtual AttributeList? Owner
         {
             get => _Owner;
             internal set
             {
                 _Owner = value;
             }
         }
-        AttributeList _Owner;
+        AttributeList? _Owner;
 
-        protected Datamodel OwnerDatamodel => Owner?.Owner;
+        protected Datamodel? OwnerDatamodel => Owner?.Owner;
 
         internal Array()
         {
@@ -94,40 +94,52 @@ public void CopyTo(T[] array, int offset)
 
         public object SyncRoot => throw new NotImplementedException();
 
-        object IList.this[int index] { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
+        object? IList.this[int index] { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
 
         public bool Remove(T item) => Inner.Remove(item);
 
         public IEnumerator<T> GetEnumerator() => Inner.GetEnumerator();
         IEnumerator IEnumerable.GetEnumerator() => Inner.GetEnumerator();
 
         #region IList
-        int IList.Add(object value)
+        int IList.Add(object? value)
         {
-            Add((T)value);
+            if (value is not null)
+                Add((T)value);
             return Count;
         }
 
-        bool IList.Contains(object value)
+        bool IList.Contains(object? value)
         {
+            if (value is null)
+                return false;
             return Contains((T)value);
         }
 
-        int IList.IndexOf(object value)
+        int IList.IndexOf(object? value)
         {
+            if (value is null)
+                throw new InvalidOperationException("Trying to get the index of a null object");
+
             return IndexOf((T)value);
         }
 
-        void IList.Insert(int index, object value)
+        void IList.Insert(int index, object? value)
         {
+            if (value is null)
+                throw new InvalidOperationException("Trying to insert a null object");
+
             Insert(index, (T)value);
         }
 
         bool IList.IsFixedSize { get { return false; } }
         bool IList.IsReadOnly { get { return false; } }
 
-        void IList.Remove(object value)
+        void IList.Remove(object? value)
         {
+            if (value is null)
+                throw new InvalidOperationException("Trying to remove a null object");
+
             Remove((T)value);
         }
 
@@ -156,7 +168,7 @@ public ElementArray(int capacity)
         /// </summary>
         internal IEnumerable<Element> RawList { get { foreach (var elem in Inner) yield return elem; } }
 
-        public override AttributeList Owner
+        public override AttributeList? Owner
         {
             get => base.Owner;
             internal set
@@ -191,7 +203,7 @@ protected override void Insert_Internal(int index, Element item)
                     throw new ElementOwnershipException();
             }
 
-            base.Insert_Internal(index, item);
+            base.Insert_Internal(index, item!);
         }
 
         public override Element this[int index]
@@ -210,6 +222,12 @@ public override Element this[int index]
                         throw new DestubException(this, index, err);
                     }
                 }
+
+                if (elem is null)
+                {
+                    throw new InvalidOperationException("Element at specified index is null");
+                }
+
                 return elem;
             }
             set => base[index] = value;
diff --git a/Attribute.cs b/Attribute.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Numerics;
 
-using AttrKVP = System.Collections.Generic.KeyValuePair<string, object>;
+using AttrKVP = System.Collections.Generic.KeyValuePair<string, object?>;
 
 namespace Datamodel
 {
@@ -16,7 +16,7 @@ class Attribute
         /// </summary>
         /// <param name="name">The name of the Attribute, which must be unique to its owner.</param>
         /// <param name="value">The value of the Attribute, which must be of a supported Datamodel type.</param>
-        public Attribute(string name, AttributeList owner, object value)
+        public Attribute(string name, AttributeList owner, object? value)
         {
             ArgumentNullException.ThrowIfNull(name);
 
@@ -48,7 +48,7 @@ public Attribute(string name, AttributeList owner, long defer_offset)
         /// <summary>
         /// Gets the Type of this Attribute's Value.
         /// </summary>
-        public Type ValueType { get; private set; }
+        public Type ValueType { get; private set; } = typeof(Element);
 
         /// <summary>
         /// Gets or sets the OverrideType of this Attributes.
@@ -97,7 +97,7 @@ internal set
         }
         AttributeList _Owner;
 
-        Datamodel OwnerDatamodel { get { return Owner?.Owner; } }
+        Datamodel? OwnerDatamodel { get { return Owner.Owner; } }
 
         /// <summary>
         /// Gets whether the value of this Attribute has yet to be decoded.
@@ -138,7 +138,7 @@ public void DeferredLoad()
         /// </summary>
         /// <exception cref="CodecException">Thrown when deferred value loading fails.</exception>
         /// <exception cref="DestubException">Thrown when Element destubbing fails.</exception>
-        public object Value
+        public object? Value
         {
             get
             {
@@ -197,12 +197,12 @@ public object Value
                 Offset = 0;
             }
         }
-        object _Value;
+        object? _Value = null;
 
         /// <summary>
         /// Gets the Attribute's Value without attempting deferred loading or destubbing.
         /// </summary>
-        public object RawValue { get { return _Value; } }
+        public object? RawValue { get { return _Value; } }
 
         #endregion
 
diff --git a/AttributeList.cs b/AttributeList.cs
@@ -83,7 +83,7 @@ public enum OverrideType
             Binary,
         }
 
-        public AttributeList(Datamodel owner)
+        public AttributeList(Datamodel? owner)
         {
             var propertyAttributes = GetPropertyDerivedAttributeList();
             PropertyInfos = new OrderedDictionary(propertyAttributes?.Count ?? 0);
@@ -102,7 +102,7 @@ public AttributeList(Datamodel owner)
         /// <summary>
         /// Gets the <see cref="Datamodel"/> that this AttributeList is owned by.
         /// </summary>
-        public virtual Datamodel Owner { get; internal set; }
+        public virtual Datamodel? Owner { get; internal set; }
 
         /// <summary>
         /// Adds a new attribute to this AttributeList.
@@ -115,7 +115,7 @@ public void Add(string key, object value)
         }
 
 
-        protected virtual ICollection<(string Name, PropertyInfo Property)> GetPropertyDerivedAttributeList()
+        protected virtual ICollection<(string Name, PropertyInfo Property)>? GetPropertyDerivedAttributeList()
         {
             return null;
         }
diff --git a/Codecs/Binary.cs b/Codecs/Binary.cs
@@ -267,7 +267,7 @@ float[] ReadVector(int dim)
             return output;
         }
 
-        object ReadValue(Datamodel dm, Type type, bool raw_string)
+        object? ReadValue(Datamodel dm, Type type, bool raw_string)
         {
             if (type == typeof(Element))
             {
@@ -450,13 +450,13 @@ public Datamodel Decode(string encoding, int encoding_version, string format, in
 
         int EncodingVersion;
 
-        public object DeferredDecodeAttribute(Datamodel dm, long offset)
+        public object? DeferredDecodeAttribute(Datamodel dm, long offset)
         {
             Reader.BaseStream.Seek(offset, SeekOrigin.Begin);
             return DecodeAttribute(dm, false);
         }
 
-        object DecodeAttribute(Datamodel dm, bool prefix)
+        object? DecodeAttribute(Datamodel dm, bool prefix)
         {
             var types = IdToType(Reader.ReadByte());
 
diff --git a/Datamodel.NET.csproj b/Datamodel.NET.csproj
@@ -5,6 +5,7 @@
     <RootNamespace>Datamodel</RootNamespace>
     <PackageId>KeyValues2</PackageId>
     <Version>0.7</Version>
+	<Nullable>enable</Nullable>
     <PackageLicenseFile>COPYING</PackageLicenseFile>
     <PackageReadmeFile>README.md</PackageReadmeFile>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
diff --git a/Datamodel.NET.sln b/Datamodel.NET.sln
@@ -6,11 +6,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Datamodel.NET", "Datamodel.
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tests", "Tests\Tests.csproj", "{4C928D60-5E48-4C0D-9C7E-C75D9734CD58}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConsoleApp1", "..\ConsoleApp1\ConsoleApp1.csproj", "{B4982001-13F5-4CD3-953E-F438FC42699E}"
-	ProjectSection(ProjectDependencies) = postProject
-		{075743A9-B292-410C-B68F-6E6CF588D60A} = {075743A9-B292-410C-B68F-6E6CF588D60A}
-	EndProjectSection
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -30,12 +25,6 @@ Global
 		{4C928D60-5E48-4C0D-9C7E-C75D9734CD58}.Documentation|Any CPU.Build.0 = Debug|Any CPU
 		{4C928D60-5E48-4C0D-9C7E-C75D9734CD58}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4C928D60-5E48-4C0D-9C7E-C75D9734CD58}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B4982001-13F5-4CD3-953E-F438FC42699E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B4982001-13F5-4CD3-953E-F438FC42699E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B4982001-13F5-4CD3-953E-F438FC42699E}.Documentation|Any CPU.ActiveCfg = Release|Any CPU
-		{B4982001-13F5-4CD3-953E-F438FC42699E}.Documentation|Any CPU.Build.0 = Release|Any CPU
-		{B4982001-13F5-4CD3-953E-F438FC42699E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B4982001-13F5-4CD3-953E-F438FC42699E}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/Element.cs b/Element.cs
diff --git a/Tests/Tests.cs b/Tests/Tests.cs

Original file line number	Diff line number	Diff line change
`@@ -24,17 +24,17 @@ public DebugView(Array<T> arr)`
`24`	`24`
`25`	`25`	`protected List<T> Inner;`
`26`	`26`
`27`		`- public virtual AttributeList Owner`
	`27`	`+ public virtual AttributeList? Owner`
`28`	`28`	`{`
`29`	`29`	`get => _Owner;`
`30`	`30`	`internal set`
`31`	`31`	`{`
`32`	`32`	`_Owner = value;`
`33`	`33`	`}`
`34`	`34`	`}`
`35`		`- AttributeList _Owner;`
	`35`	`+ AttributeList? _Owner;`
`36`	`36`
`37`		`- protected Datamodel OwnerDatamodel => Owner?.Owner;`
	`37`	`+ protected Datamodel? OwnerDatamodel => Owner?.Owner;`
`38`	`38`
`39`	`39`	`internal Array()`
`40`	`40`	`{`
`@@ -94,40 +94,52 @@ public void CopyTo(T[] array, int offset)`
`94`	`94`
`95`	`95`	`public object SyncRoot => throw new NotImplementedException();`
`96`	`96`
`97`		`- object IList.this[int index] { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }`
	`97`	`+ object? IList.this[int index] { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }`
`98`	`98`
`99`	`99`	`public bool Remove(T item) => Inner.Remove(item);`
`100`	`100`
`101`	`101`	`public IEnumerator<T> GetEnumerator() => Inner.GetEnumerator();`
`102`	`102`	`IEnumerator IEnumerable.GetEnumerator() => Inner.GetEnumerator();`
`103`	`103`
`104`	`104`	`#region IList`
`105`		`- int IList.Add(object value)`
	`105`	`+ int IList.Add(object? value)`
`106`	`106`	`{`
`107`		`- Add((T)value);`
	`107`	`+ if (value is not null)`
	`108`	`+ Add((T)value);`
`108`	`109`	`return Count;`
`109`	`110`	`}`
`110`	`111`
`111`		`- bool IList.Contains(object value)`
	`112`	`+ bool IList.Contains(object? value)`
`112`	`113`	`{`
	`114`	`+ if (value is null)`
	`115`	`+ return false;`
`113`	`116`	`return Contains((T)value);`
`114`	`117`	`}`
`115`	`118`
`116`		`- int IList.IndexOf(object value)`
	`119`	`+ int IList.IndexOf(object? value)`
`117`	`120`	`{`
	`121`	`+ if (value is null)`
	`122`	`+ throw new InvalidOperationException("Trying to get the index of a null object");`
	`123`	`+`
`118`	`124`	`return IndexOf((T)value);`
`119`	`125`	`}`
`120`	`126`
`121`		`- void IList.Insert(int index, object value)`
	`127`	`+ void IList.Insert(int index, object? value)`
`122`	`128`	`{`
	`129`	`+ if (value is null)`
	`130`	`+ throw new InvalidOperationException("Trying to insert a null object");`
	`131`	`+`
`123`	`132`	`Insert(index, (T)value);`
`124`	`133`	`}`
`125`	`134`
`126`	`135`	`bool IList.IsFixedSize { get { return false; } }`
`127`	`136`	`bool IList.IsReadOnly { get { return false; } }`
`128`	`137`
`129`		`- void IList.Remove(object value)`
	`138`	`+ void IList.Remove(object? value)`
`130`	`139`	`{`
	`140`	`+ if (value is null)`
	`141`	`+ throw new InvalidOperationException("Trying to remove a null object");`
	`142`	`+`
`131`	`143`	`Remove((T)value);`
`132`	`144`	`}`
`133`	`145`
`@@ -156,7 +168,7 @@ public ElementArray(int capacity)`
`156`	`168`	`/// </summary>`
`157`	`169`	`internal IEnumerable<Element> RawList { get { foreach (var elem in Inner) yield return elem; } }`
`158`	`170`
`159`		`- public override AttributeList Owner`
	`171`	`+ public override AttributeList? Owner`
`160`	`172`	`{`
`161`	`173`	`get => base.Owner;`
`162`	`174`	`internal set`
`@@ -191,7 +203,7 @@ protected override void Insert_Internal(int index, Element item)`
`191`	`203`	`throw new ElementOwnershipException();`
`192`	`204`	`}`
`193`	`205`
`194`		`- base.Insert_Internal(index, item);`
	`206`	`+ base.Insert_Internal(index, item!);`
`195`	`207`	`}`
`196`	`208`
`197`	`209`	`public override Element this[int index]`
`@@ -210,6 +222,12 @@ public override Element this[int index]`
`210`	`222`	`throw new DestubException(this, index, err);`
`211`	`223`	`}`
`212`	`224`	`}`
	`225`	`+`
	`226`	`+ if (elem is null)`
	`227`	`+ {`
	`228`	`+ throw new InvalidOperationException("Element at specified index is null");`
	`229`	`+ }`
	`230`	`+`
`213`	`231`	`return elem;`
`214`	`232`	`}`
`215`	`233`	`set => base[index] = value;`
Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ public enum OverrideType`
`83`	`83`	`Binary,`
`84`	`84`	`}`
`85`	`85`
`86`		`- public AttributeList(Datamodel owner)`
	`86`	`+ public AttributeList(Datamodel? owner)`
`87`	`87`	`{`
`88`	`88`	`var propertyAttributes = GetPropertyDerivedAttributeList();`
`89`	`89`	`PropertyInfos = new OrderedDictionary(propertyAttributes?.Count ?? 0);`
`@@ -102,7 +102,7 @@ public AttributeList(Datamodel owner)`
`102`	`102`	`/// <summary>`
`103`	`103`	`/// Gets the <see cref="Datamodel"/> that this AttributeList is owned by.`
`104`	`104`	`/// </summary>`
`105`		`- public virtual Datamodel Owner { get; internal set; }`
	`105`	`+ public virtual Datamodel? Owner { get; internal set; }`
`106`	`106`
`107`	`107`	`/// <summary>`
`108`	`108`	`/// Adds a new attribute to this AttributeList.`
`@@ -115,7 +115,7 @@ public void Add(string key, object value)`
`115`	`115`	`}`
`116`	`116`
`117`	`117`
`118`		`- protected virtual ICollection<(string Name, PropertyInfo Property)> GetPropertyDerivedAttributeList()`
	`118`	`+ protected virtual ICollection<(string Name, PropertyInfo Property)>? GetPropertyDerivedAttributeList()`
`119`	`119`	`{`
`120`	`120`	`return null;`
`121`	`121`	`}`
Original file line number	Diff line number	Diff line change
`@@ -267,7 +267,7 @@ float[] ReadVector(int dim)`
`267`	`267`	`return output;`
`268`	`268`	`}`
`269`	`269`
`270`		`- object ReadValue(Datamodel dm, Type type, bool raw_string)`
	`270`	`+ object? ReadValue(Datamodel dm, Type type, bool raw_string)`
`271`	`271`	`{`
`272`	`272`	`if (type == typeof(Element))`
`273`	`273`	`{`
`@@ -450,13 +450,13 @@ public Datamodel Decode(string encoding, int encoding_version, string format, in`
`450`	`450`
`451`	`451`	`int EncodingVersion;`
`452`	`452`
`453`		`- public object DeferredDecodeAttribute(Datamodel dm, long offset)`
	`453`	`+ public object? DeferredDecodeAttribute(Datamodel dm, long offset)`
`454`	`454`	`{`
`455`	`455`	`Reader.BaseStream.Seek(offset, SeekOrigin.Begin);`
`456`	`456`	`return DecodeAttribute(dm, false);`
`457`	`457`	`}`
`458`	`458`
`459`		`- object DecodeAttribute(Datamodel dm, bool prefix)`
	`459`	`+ object? DecodeAttribute(Datamodel dm, bool prefix)`
`460`	`460`	`{`
`461`	`461`	`var types = IdToType(Reader.ReadByte());`
`462`	`462`