.NET 8 improvements

rbergen · Dec 10, 2023 · 9beb16a · 9beb16a
1 parent bf26a2c
commit 9beb16a
Show file tree

Hide file tree

Showing 13 changed files with 104 additions and 188 deletions.
diff --git a/src/MixAssembler/Parser.cs b/src/MixAssembler/Parser.cs
@@ -254,18 +254,18 @@ private static string[] SplitLine(string sourceLine)
 			var opFieldStart = FindFirstNonWhiteSpace(sourceLine, searchBeyondIndex);
 
 			if (opFieldStart == -1)
-				return new string[] { sourceLine.Substring(0, searchBeyondIndex), string.Empty, string.Empty, string.Empty };
+				return new string[] { sourceLine[..searchBeyondIndex], string.Empty, string.Empty, string.Empty };
 
 			var opFieldEnd = FindFirstWhiteSpace(sourceLine, opFieldStart);
 
 			if (opFieldEnd == -1)
-				return new string[] { sourceLine.Substring(0, searchBeyondIndex), sourceLine[opFieldStart..], string.Empty, string.Empty };
+				return new string[] { sourceLine[..searchBeyondIndex], sourceLine[opFieldStart..], string.Empty, string.Empty };
 
 			int opFieldLength = opFieldEnd - opFieldStart;
 			var addressFieldStart = FindFirstNonWhiteSpace(sourceLine, opFieldEnd);
 
 			if (addressFieldStart == -1)
-				return new string[] { sourceLine.Substring(0, searchBeyondIndex), sourceLine.Substring(opFieldStart, opFieldLength), string.Empty, string.Empty };
+				return new string[] { sourceLine[..searchBeyondIndex], sourceLine.Substring(opFieldStart, opFieldLength), string.Empty, string.Empty };
 
 			if (sourceLine[addressFieldStart] == '"')
 			{
@@ -280,15 +280,15 @@ private static string[] SplitLine(string sourceLine)
 				addressFieldEnd = FindFirstWhiteSpace(sourceLine, addressFieldStart);
 
 			if (addressFieldEnd == -1)
-				return new string[] { sourceLine.Substring(0, searchBeyondIndex), sourceLine.Substring(opFieldStart, opFieldLength), sourceLine[addressFieldStart..], string.Empty };
+				return new string[] { sourceLine[..searchBeyondIndex], sourceLine.Substring(opFieldStart, opFieldLength), sourceLine[addressFieldStart..], string.Empty };
 
 			int addressFieldLength = addressFieldEnd - addressFieldStart;
 			var commentFieldStart = FindFirstNonWhiteSpace(sourceLine, addressFieldEnd);
 
 			if (commentFieldStart == -1)
-				return new string[] { sourceLine.Substring(0, searchBeyondIndex), sourceLine.Substring(opFieldStart, opFieldLength), sourceLine.Substring(addressFieldStart, addressFieldLength), string.Empty };
+				return new string[] { sourceLine[..searchBeyondIndex], sourceLine.Substring(opFieldStart, opFieldLength), sourceLine.Substring(addressFieldStart, addressFieldLength), "" };
 
-			return new string[] { sourceLine.Substring(0, searchBeyondIndex), sourceLine.Substring(opFieldStart, opFieldLength), sourceLine.Substring(addressFieldStart, addressFieldLength), sourceLine[commentFieldStart..] };
+			return new string[] { sourceLine[..searchBeyondIndex], sourceLine.Substring(opFieldStart, opFieldLength), sourceLine.Substring(addressFieldStart, addressFieldLength), sourceLine[commentFieldStart..] };
 		}
 	}
 }
diff --git a/src/MixEmul/Components/AssemblyFindingListView.cs b/src/MixEmul/Components/AssemblyFindingListView.cs
@@ -117,12 +117,9 @@ public int Compare(AssemblyFinding x, AssemblyFinding y)
 			}
 		}
 
-		public class SelectionChangedEventArgs : EventArgs
+		public class SelectionChangedEventArgs(AssemblyFinding finding) : EventArgs
 		{
-			private readonly AssemblyFinding mSelectedFinding;
-
-			public SelectionChangedEventArgs(AssemblyFinding finding)
-				=> mSelectedFinding = finding;
+			private readonly AssemblyFinding mSelectedFinding = finding;
 
 			public AssemblyFinding SelectedFinding => mSelectedFinding;
 		}

diff --git a/src/MixEmul/Components/InstructionInstanceTextBox.cs b/src/MixEmul/Components/InstructionInstanceTextBox.cs
@@ -205,7 +205,7 @@ private bool AssembleInstruction(bool markErrors)
 
 			var instance = Assembler.Assemble(Text, MemoryAddress, out ParsedSourceLine line, Symbols, out AssemblyFindingCollection findings);
 
-			if (instance != null && !(instance is MixInstruction.Instance))
+			if (instance != null && instance is not MixInstruction.Instance)
 			{
 				findings.Add(new AssemblyError(0, LineSection.OpField, 0, line.OpField.Length, new ValidationError("only MIX instruction mnemonics supported")));
 				instance = null;
@@ -553,7 +553,7 @@ public IWord WordValue
 			get => this.instructionWord;
 			set
 			{
-				if (!(value is IFullWord))
+				if (value is not IFullWord)
 				{
 					throw new ArgumentException("value must be an IFullWord");
 				}

diff --git a/src/MixEmul/Components/LongValueTextBox.cs b/src/MixEmul/Components/LongValueTextBox.cs
@@ -433,22 +433,14 @@ public override string Text
 			set => CheckAndUpdateValue(value);
 		}
 
-		public class ValueChangedEventArgs : EventArgs
+		public class ValueChangedEventArgs(Word.Signs oldSign, long oldMagnitude, Word.Signs newSign, long newMagnitude) : EventArgs
 		{
-			public long OldMagnitude { get; private set; }
-			public Word.Signs OldSign { get; private set; }
-			public long NewMagnitude { get; private set; }
-			public Word.Signs NewSign { get; private set; }
+	  public long OldMagnitude { get; private set; } = oldMagnitude;
+	  public Word.Signs OldSign { get; private set; } = oldSign;
+	  public long NewMagnitude { get; private set; } = newMagnitude;
+	  public Word.Signs NewSign { get; private set; } = newSign;
 
-			public ValueChangedEventArgs(Word.Signs oldSign, long oldMagnitude, Word.Signs newSign, long newMagnitude)
-			{
-				OldMagnitude = oldMagnitude;
-				NewMagnitude = newMagnitude;
-				OldSign = oldSign;
-				NewSign = newSign;
-			}
-
-			public long NewValue
+	  public long NewValue
 				=> NewSign.ApplyTo(NewMagnitude);
 
 			public long OldValue

diff --git a/src/MixEmul/Components/MixByteCollectionCharTextBox.cs b/src/MixEmul/Components/MixByteCollectionCharTextBox.cs
@@ -146,7 +146,7 @@ private void This_TextChanged(object sender, EventArgs e)
 				validText += c;
 
 			if (validText.Length > this.byteCollection.MaxByteCount)
-				validText = validText.Substring(0, this.byteCollection.MaxByteCount);
+				validText = validText[..this.byteCollection.MaxByteCount];
 
 			if (validText.Length > 0 || TextLength == 0)
 			{
@@ -281,7 +281,7 @@ public IMixByteCollection MixByteCollectionValue
 					this.byteCollection = value;
 
 					if (TextLength > this.byteCollection.MaxByteCount)
-						Text = Text.Substring(0, this.byteCollection.MaxByteCount);
+						Text = Text[..this.byteCollection.MaxByteCount];
 
 					Select(TextLength, 0);
 

diff --git a/src/MixEmul/Components/MixByteTextBox.cs b/src/MixEmul/Components/MixByteTextBox.cs
@@ -197,17 +197,11 @@ public sealed override string Text
 			set => CheckAndUpdateValue(value);
 		}
 
-		public class ValueChangedEventArgs : EventArgs
+		public class ValueChangedEventArgs(MixByte oldValue, MixByte newValue) : EventArgs
 		{
-			public MixByte NewValue { get; private set; }
-			public MixByte OldValue { get; private set; }
-
-			public ValueChangedEventArgs(MixByte oldValue, MixByte newValue)
-			{
-				OldValue = oldValue;
-				NewValue = newValue;
-			}
-		}
+	  public MixByte NewValue { get; private set; } = newValue;
+	  public MixByte OldValue { get; private set; } = oldValue;
+	}
 
 		public delegate void ValueChangedEventHandler(MixByteTextBox sender, MixByteTextBox.ValueChangedEventArgs e);
 	}