From ffe559d79232933f6a680785edfa53869abc3f70 Mon Sep 17 00:00:00 2001
From: Adrian Conlon <98398945+AdrianConlon@users.noreply.github.com>
Date: Sun, 6 Oct 2024 13:24:04 +0100
Subject: [PATCH] Add some simplifications for argument null exception handling

---
 Fuse/Lines.cs       |  2 ++
 Fuse/MemoryDatum.cs | 11 ++---------
 Fuse/Result.cs      |  5 +----
 Fuse/Test.cs        |  5 +----
 Fuse/TestEvent.cs   |  5 +----
 5 files changed, 7 insertions(+), 21 deletions(-)

diff --git a/Fuse/Lines.cs b/Fuse/Lines.cs
index a5b9e5e..658c8e0 100644
--- a/Fuse/Lines.cs
+++ b/Fuse/Lines.cs
@@ -5,6 +5,7 @@ namespace Fuse
 {
     using System;
     using System.Collections.Generic;
+    using System.Diagnostics;
     using System.IO;
 
     public class Lines
@@ -24,6 +25,7 @@ namespace Fuse
                 while (!reader.EndOfStream)
                 {
                     var line = reader.ReadLine();
+                    Debug.Assert(line != null);
                     var ignored = line.StartsWith(";", StringComparison.OrdinalIgnoreCase);
                     if (!ignored)
                     {
diff --git a/Fuse/MemoryDatum.cs b/Fuse/MemoryDatum.cs
index a93200d..a834df9 100644
--- a/Fuse/MemoryDatum.cs
+++ b/Fuse/MemoryDatum.cs
@@ -17,21 +17,14 @@ namespace Fuse
 
         public void Parse(string line)
         {
-            if (string.IsNullOrWhiteSpace(line))
-            {
-                throw new ArgumentNullException(nameof(line));
-            }
-
+            ArgumentNullException.ThrowIfNullOrWhiteSpace(line);
             var tokens = line.Split(new char[] { ' ', '\t' });
             this.Parse(tokens);
         }
 
         public void Parse(string[] tokens)
         {
-            if (tokens == null)
-            {
-                throw new ArgumentNullException(nameof(tokens));
-            }
+            ArgumentNullException.ThrowIfNull(tokens);
 
             this.Address = Convert.ToUInt16(tokens[0], 16);
 
diff --git a/Fuse/Result.cs b/Fuse/Result.cs
index 7977f9d..1afa761 100644
--- a/Fuse/Result.cs
+++ b/Fuse/Result.cs
@@ -23,10 +23,7 @@ namespace Fuse
 
         public bool TryParse(Lines lines)
         {
-            if (lines == null)
-            {
-                throw new ArgumentNullException(nameof(lines));
-            }
+            ArgumentNullException.ThrowIfNull(lines);
 
             while (!lines.EndOfFile && string.IsNullOrWhiteSpace(this.Description))
             {
diff --git a/Fuse/Test.cs b/Fuse/Test.cs
index 18eba66..e33e6a1 100644
--- a/Fuse/Test.cs
+++ b/Fuse/Test.cs
@@ -19,10 +19,7 @@ namespace Fuse
 
         public bool TryParse(Lines lines)
         {
-            if (lines == null)
-            {
-                throw new ArgumentNullException(nameof(lines));
-            }
+            ArgumentNullException.ThrowIfNull(lines);
 
             while (!lines.EndOfFile && string.IsNullOrEmpty(this.Description))
             {
diff --git a/Fuse/TestEvent.cs b/Fuse/TestEvent.cs
index e91dc60..80c943e 100644
--- a/Fuse/TestEvent.cs
+++ b/Fuse/TestEvent.cs
@@ -37,10 +37,7 @@ namespace Fuse
 
         public bool TryParse(Lines lines)
         {
-            if (lines == null)
-            {
-                throw new ArgumentNullException(nameof(lines));
-            }
+            ArgumentNullException.ThrowIfNull(lines);
 
             var returned = this.TryParseLine(lines.ReadLine());
             if (!returned)