Enable nullable

Fixes #124

Author: xPaw

Directory.Build.props

@@ -19,6 +19,7 @@
     <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <AnalysisMode>AllEnabledByDefault</AnalysisMode>
+    <Nullable>enable</Nullable>
   </PropertyGroup>
 
   <PropertyGroup>

ValveKeyValue/ValveKeyValue.Console/ValveKeyValue.Console.csproj

@@ -4,7 +4,6 @@
     <TargetFramework>net10.0</TargetFramework>
     <RollForward>LatestMajor</RollForward>
     <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
     <PublishAot>true</PublishAot>
   </PropertyGroup>
   <ItemGroup>

ValveKeyValue/ValveKeyValue.Test/ValveKeyValue.Test.csproj

@@ -7,6 +7,7 @@
     <Description>Unit Tests for library to parse and write Valve KeyValue formats</Description>
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>../ValveKeyValue/ValveKeyValue.snk</AssemblyOriginatorKeyFile>
+    <Nullable>disable</Nullable>
   </PropertyGroup>
   <ItemGroup>
     <None Remove="Test Data\**\*.txt" />

ValveKeyValue/ValveKeyValue/Abstraction/IVisitationListener.cs

@@ -2,13 +2,13 @@ namespace ValveKeyValue.Abstraction
 {
     interface IVisitationListener : IDisposable
     {
-        void OnObjectStart(string name, KVFlag flag);
+        void OnObjectStart(string? name, KVFlag flag);
 
         void OnObjectEnd();
 
         void OnKeyValuePair(string name, KVObject value);
 
-        void OnArrayStart(string name, KVFlag flag, int elementCount, bool allSimpleElements);
+        void OnArrayStart(string? name, KVFlag flag, int elementCount, bool allSimpleElements);
 
         void OnArrayValue(KVObject value);
 

ValveKeyValue/ValveKeyValue/Abstraction/KVObjectVisitor.cs

@@ -11,12 +11,12 @@ public KVObjectVisitor(IVisitationListener listener)
 
         readonly IVisitationListener listener;
 
-        public void Visit(string name, KVObject @object)
+        public void Visit(string? name, KVObject @object)
         {
             VisitObject(name, @object, false);
         }
 
-        void VisitObject(string name, KVObject obj, bool isArray)
+        void VisitObject(string? name, KVObject obj, bool isArray)
         {
             switch (obj.ValueType)
             {
@@ -66,7 +66,7 @@ void VisitObject(string name, KVObject obj, bool isArray)
                         listener.OnArrayValue(obj);
                         break;
                     }
-                    listener.OnKeyValuePair(name, obj);
+                    listener.OnKeyValuePair(name!, obj);
                     break;
 
                 default:

ValveKeyValue/ValveKeyValue/DefaultObjectReflector.cs

@@ -36,6 +36,6 @@ IEnumerable<IObjectMember> IObjectReflector.GetMembers([DynamicallyAccessedMembe
         }
 
         static bool IsValueTupleType(Type type)
-            => type.IsGenericType && type.FullName.StartsWith("System.ValueTuple`", StringComparison.Ordinal);
+            => type.IsGenericType && type.FullName!.StartsWith("System.ValueTuple`", StringComparison.Ordinal);
     }
 }

ValveKeyValue/ValveKeyValue/Deserialization/KVObjectBuilder.cs

@@ -54,7 +54,7 @@ public void OnArrayValue(KVObject value)
             if (StateStack.Count > 0)
             {
                 var state = StateStack.Peek();
-                state.Items.Add(new KeyValuePair<string, KVObject>(null, value));
+                state.Items.Add(new KeyValuePair<string, KVObject>(null!, value));
             }
             else
             {
@@ -76,7 +76,7 @@ public void OnObjectEnd()
 
             var state = StateStack.Pop();
             var completedObject = MakeObject(state);
-            StateStack.Peek().Items.Add(new KeyValuePair<string, KVObject>(state.Key, completedObject));
+            StateStack.Peek().Items.Add(new KeyValuePair<string, KVObject>(state.Key!, completedObject!));
         }
 
         public void OnArrayEnd()
@@ -88,7 +88,7 @@ public void OnArrayEnd()
 
             var state = StateStack.Pop();
             var completedObject = MakeArray(state);
-            StateStack.Peek().Items.Add(new KeyValuePair<string, KVObject>(state.Key, completedObject));
+            StateStack.Peek().Items.Add(new KeyValuePair<string, KVObject>(state.Key!, completedObject!));
         }
 
         public void DiscardCurrentObject()
@@ -104,7 +104,7 @@ public void DiscardCurrentObject()
             }
         }
 
-        public void OnObjectStart(string name, KVFlag flag)
+        public void OnObjectStart(string? name, KVFlag flag)
         {
             var state = new KVPartialState
             {
@@ -114,7 +114,7 @@ public void OnObjectStart(string name, KVFlag flag)
             StateStack.Push(state);
         }
 
-        public void OnArrayStart(string name, KVFlag flag, int elementCount, bool allSimpleElements)
+        public void OnArrayStart(string? name, KVFlag flag, int elementCount, bool allSimpleElements)
         {
             var state = new KVPartialState
             {
@@ -153,12 +153,12 @@ protected virtual void FinalizeState()
             }
         }
 
-        static KeyValuePair<string, KVObject> MakeResult(KVPartialState state, KVObject obj)
+        static KeyValuePair<string, KVObject> MakeResult(KVPartialState state, KVObject? obj)
         {
-            return new KeyValuePair<string, KVObject>(state.Key, obj);
+            return new KeyValuePair<string, KVObject>(state.Key!, obj!);
         }
 
-        KVObject MakeObject(KVPartialState state)
+        KVObject? MakeObject(KVPartialState state)
         {
             if (state.Discard)
             {
@@ -187,7 +187,7 @@ KVObject MakeObject(KVPartialState state)
             return result;
         }
 
-        static KVObject MakeArray(KVPartialState state)
+        static KVObject? MakeArray(KVPartialState state)
         {
             if (state.Discard)
             {

ValveKeyValue/ValveKeyValue/Deserialization/KVPartialState.cs

@@ -2,11 +2,11 @@ namespace ValveKeyValue.Deserialization
 {
     class KVPartialState
     {
-        public string Key { get; set; }
+        public string? Key { get; set; }
 
         public KVFlag Flag { get; set; }
 
-        public KVObject Value { get; set; }
+        public KVObject? Value { get; set; }
 
         public List<KeyValuePair<string, KVObject>> Items { get; } = new List<KeyValuePair<string, KVObject>>();
 

ValveKeyValue/ValveKeyValue/Deserialization/KVTokenReader.cs

@@ -28,8 +28,6 @@ public void Dispose()
             if (!disposed)
             {
                 textReader.Dispose();
-                textReader = null;
-
                 disposed = true;
             }
         }

ValveKeyValue/ValveKeyValue/Deserialization/KeyValues1/KV1TextReader.cs

@@ -53,7 +53,7 @@ public KVHeader ReadHeader()
                 switch (token.TokenType)
                 {
                     case KVTokenType.String:
-                        ReadText(token.Value);
+                        ReadText(token.Value!);
                         break;
 
                     case KVTokenType.ObjectStart:
@@ -65,7 +65,7 @@ public KVHeader ReadHeader()
                         break;
 
                     case KVTokenType.Condition:
-                        HandleCondition(token.Value);
+                        HandleCondition(token.Value!);
                         break;
 
                     case KVTokenType.EndOfFile:
@@ -89,7 +89,7 @@ public KVHeader ReadHeader()
                             throw new KeyValueException($"Inclusions are only valid at the beginning of a file, but found one at {tokenReader.PreviousTokenPosition}.");
                         }
 
-                        stateMachine.AddItemForMerging(token.Value);
+                        stateMachine.AddItemForMerging(token.Value!);
                         break;
 
                     case KVTokenType.IncludeAndAppend:
@@ -98,7 +98,7 @@ public KVHeader ReadHeader()
                             throw new KeyValueException($"Inclusions are only valid at the beginning of a file, but found one at {tokenReader.PreviousTokenPosition}.");
                         }
 
-                        stateMachine.AddItemForAppending(token.Value);
+                        stateMachine.AddItemForAppending(token.Value!);
                         break;
 
                     default:
@@ -135,7 +135,7 @@ void ReadText(string text)
 
                 case KV1TextReaderState.InObjectBetweenKeyAndValue:
                     var value = ParseValue(text);
-                    var name = stateMachine.CurrentName;
+                    var name = stateMachine.CurrentName!;
                     listener.OnKeyValuePair(name, value);
 
                     stateMachine.Push(KV1TextReaderState.InObjectAfterValue);